Merge branch 'release-2.6.8'

cfphpflex · Jun 20, 2014 · b7e1a71 · b7e1a71
2 parents c288481 + 7e796be
commit b7e1a71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+2.6.8 (2014-06-19)
+------------------
+
+* Added support for Captions to the Elastic Transcoder client.
+* Added support for Service Captions to the Elastic MapReduce client.
+* Updated the S3 PostObject to ease customization.
+* Fixed an issue in some EC2 waiters by merging PR #306.
+* Fixed an issue with the DynamoDB `WriteRequestBatch` by merging PR #310.
+
 2.6.7 (2014-06-12)
 ------------------
 

diff --git a/src/Aws/Common/Aws.php b/src/Aws/Common/Aws.php
@@ -28,7 +28,7 @@ class Aws extends ServiceBuilder
     /**
      * @var string Current version of the SDK
      */
-    const VERSION = '2.6.7';
+    const VERSION = '2.6.8';
 
     /**
      * Create a new service locator for the AWS SDK