From fbccd38e379016a3907a48893b4ecb1b1028d678 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Mon, 2 Oct 2017 09:13:10 -0700
Subject: [PATCH] Add last few cherrypicks to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ec771e8426..0b82ed0b158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,8 @@ Ansible Changes By Release
 * Updated win_chocolatey example to be clearer around what should be used with become
 * Fix for copy module when permissions are changed but the file contents are not ( https://github.com/ansible/ansible/issues/30556 )
 * corrected YAML_FILENAME_EXTENSIONS ini setter as key/section were swapped
+* Better error message when a yaml inventory is invalid
+* avoid include_Xs conflating vars with options
 
 
 <a id="2.4"></a>