From db967a5c979ab27f8feb0541683c1f6aca017310 Mon Sep 17 00:00:00 2001
From: Trevor Rowe <trevorrowe@gmail.com>
Date: Mon, 27 Jul 2015 12:43:11 -0700
Subject: [PATCH] Added changelog entry for KMS client-side encryption.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bbb04bb748..352e8e9ac65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Unreleased Changes
 ------------------
 
+* Feature - KMS Client-Side-Encryption - Added support to `Aws::S3::Encryption::Client` for using AWS Key Management Service (KMS) to manage master encryption keys.
+
+  ```ruby
+  s3_enc = Aws::S3::Encryption::Client.new(kms_key_id: 'kms-key-id')
+  s3_enc.put_object(bucket:'aws-sdk', key:'secret', body:'data')
+  s3_enc.get_object(bucket:'aws-sdk', key:'secret').body.read
+  #=> 'data'
+  ```
+
+  This implementation is compatible with objects written by the AWS SDK for Java
+  encryption client.
+
 2.1.8 (2015-07-23)
 ------------------