From e8da4d62991d24217b54f1e3982ca1ed187c1d9b Mon Sep 17 00:00:00 2001
From: James Saryerwinnie <js@jamesls.com>
Date: Tue, 7 Oct 2014 14:18:11 -0700
Subject: [PATCH] Add bug fix to the changelog

---
 CHANGELOG.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 48cf11068b99..2d17b5cde11d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,9 @@ Next Release (TBD)
 * bugfix:S3 Response Parsing: Fix regression for parsing S3 responses
   containing a status code of 200 with an error response body
   (`botocore issue 342 <https://github.com/boto/botocore/pull/342>`__)
+* bugfix:Shorthand Error Message: Ensure the error message for
+  shorthand parsing always contains the CLI argument name
+  (`issue 935 <https://github.com/aws/aws-cli/pull/935>`__)
 
 
 1.5.0