From 2695ddf07b096e66f82b905a31300939280024fd Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Tue, 1 Mar 2022 20:48:00 -0500
Subject: [PATCH] changelog: add entries for #259 and #261

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ac6f763..b908a69e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.4.17 (Unreleased)
+
+IMPROVEMENTS:
+* resource/nomad_job: allow passing Consul and Vault token through the job resource ([#261](https://github.com/hashicorp/terraform-provider-nomad/pull/261))
+
+BUG FIXES:
+* resource/scheduler_config: fixed an issue that caused the value of `memory_oversubscription_enabled` to never be set ([#259](https://github.com/hashicorp/terraform-provider-nomad/pull/259))
+
 ## 1.4.16 (November 24, 2021)
 
 * **Target Nomad 1.2.0**: updated the Nomad client to support Nomad API and jobspec version 1.2.0 ([#256](https://github.com/hashicorp/terraform-provider-nomad/pull/256))