Merge branch 'release-1.2.5' into develop

* release-1.2.5: Bumping version to 1.2.5 Update completer unit tests with new changes Update CHANGELOG with latest features Add high level operations for cloudtrail
aws · Nov 13, 2013 · 537a037 · 537a037
2 parents d2983b9 + 80843d7
commit 537a037
Show file tree

Hide file tree

Showing 9 changed files with 605 additions and 11 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,20 @@
 CHANGELOG
 =========
 
+1.2.5
+=====
+
+* Add support for AWS Cloudtrail
+* Add support for identity federation using SAML 2.0 in the ``aws iam`` command
+* Update the ``aws redshift`` command to include several new features related to
+  event notifications, encryption, audit logging, data load from external hosts,
+  WLM configuration, and database distribution styles and functions
+* Add a ``--associate-public-ip-address`` option to the ``ec2 run-instances``
+  command (`issue 479 <https://github.com/aws/aws-cli/issues/479>`__)
+* Add an ``s3 website`` command for configuring website configuration for an S3
+  bucket (`issue 482 <https://github.com/aws/aws-cli/pull/482>`__)
+
+
 1.2.4
 =====
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.2.4'
+__version__ = '1.2.5'
 
 #
 # Get our data path to be added to botocore's search path