From ce67bc2b09bc3fcdd37f1c00a704c4039b6b2c4e Mon Sep 17 00:00:00 2001
From: Joe Gregorio <jcgregorio@google.com>
Date: Tue, 2 Jul 2013 13:50:31 -0400
Subject: [PATCH] Pepare for v1.2 release.

Reviewed in https://codereview.appspot.com/10841043/.
---
 CHANGELOG                | 26 ++++++++++++++++++++++++++
 apiclient/__init__.py    |  2 +-
 oauth2client/__init__.py |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4e2a9eb..7892645 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,29 @@
+v1.2
+  Version 1.2
+
+  The use of the gflags library is now deprecated, and is no longer a
+    dependency. If you are still using the oauth2client.tools.run() function
+    then include gflags as a dependency of your application or switch to
+    oauth2client.tools.run_flow.
+  Samples have been updated to use the new apiclient.sample_tools, and no
+    longer use gflags.
+  Added support for the experimental Object Change Notification, as found in
+    the Cloud Storage API.
+  The oauth2client App Engine decorators are now threadsafe.
+
+  - Use the following redirects feature of httplib2 where it returns the
+    ultimate URL after a series of redirects to avoid multiple hops for every
+    resumable media upload request.
+  - Updated AdSense Management API samples to V1.3
+  - Add option to automatically retry requests.
+  - Ability to list registered keys in multistore_file.
+  - User-agent must contain (gzip).
+  - The 'method' parameter for httplib2 is not positional. This would cause
+    spurious warnings in the logging.
+  - Making OAuth2Decorator more extensible. Fixes Issue 256.
+  - Update AdExchange Buyer API examples to version v1.2.
+
+
 v1.1
   Version 1.1
 
diff --git a/apiclient/__init__.py b/apiclient/__init__.py
index 6a74889..fe31691 100644
--- a/apiclient/__init__.py
+++ b/apiclient/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.1"
+__version__ = "1.2"
diff --git a/oauth2client/__init__.py b/oauth2client/__init__.py
index 7e4e122..ac84748 100644
--- a/oauth2client/__init__.py
+++ b/oauth2client/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.1"
+__version__ = "1.2"
 
 GOOGLE_AUTH_URI = 'https://accounts.google.com/o/oauth2/auth'
 GOOGLE_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke'