From 3cc9a454a9f11c2b14826e6d75950655f0457e7c Mon Sep 17 00:00:00 2001
From: Joe Gregorio <jcgregorio@google.com>
Date: Thu, 7 Mar 2013 10:08:39 -0500
Subject: [PATCH] Prepare for v1.1 release.

Reviewed in https://codereview.appspot.com/7516045/.
---
 CHANGELOG                | 28 ++++++++++++++++++++++++++++
 apiclient/__init__.py    |  2 +-
 oauth2client/__init__.py |  2 +-
 setup.py                 |  2 +-
 setup_oauth2client.py    |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f93c597..4e2a9eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,31 @@
+v1.1
+  Version 1.1
+
+  Add PEM support to SignedJWTAssertionCredentials (used to only support
+  PKCS12 formatted keys). Note that if you use PEM formatted keys you can use
+  PyCrypto 2.6 or later instead of OpenSSL.
+
+  Allow deserialized discovery docs to be passed to build_from_document().
+
+  - Make ResumableUploadError derive from HttpError.
+  - Many changes to move all the closures in apiclient.discovery into real
+  -  classes and objects.
+  - Make from_json behavior inheritable.
+  - Expose the full token response in OAuth2Client and OAuth2Decorator.
+  - Handle reasons that are None.
+  - Added support for NDB based storing of oauth2client objects.
+  - Update grant_type for AssertionCredentials.
+  - Adding a .revoke() to Credentials. Closes issue 98.
+  - Modify oauth2client.multistore_file to store and retrieve credentials
+    using an arbitrary key.
+  - Don't accept 403 challenges by default for auth challenges.
+  - Set httplib2.RETRIES to 1.
+  - Consolidate handling of scopes.
+  - Upgrade to httplib2 version 0.8.
+  - Allow setting the response_type in OAuth2WebServerFlow.
+  - Ensure that dataWrapper feature is checked before using the 'data' value.
+  - HMAC verification does not use a constant time algorithm.
+
 v1.0
  Version 1.0
 
diff --git a/apiclient/__init__.py b/apiclient/__init__.py
index 4802e90..f901408 100644
--- a/apiclient/__init__.py
+++ b/apiclient/__init__.py
@@ -1 +1 @@
-__version__ = "1.0"
+__version__ = "1.1"
diff --git a/oauth2client/__init__.py b/oauth2client/__init__.py
index 13d949f..7e4e122 100644
--- a/oauth2client/__init__.py
+++ b/oauth2client/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "1.1"
 
 GOOGLE_AUTH_URI = 'https://accounts.google.com/o/oauth2/auth'
 GOOGLE_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke'
diff --git a/setup.py b/setup.py
index 3e0ebee..4ab35fb 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ packages = [
   ]
 
 install_requires = [
-    'httplib2>=0.7.7',
+    'httplib2>=0.8',
     'python-gflags',
     ]
 
diff --git a/setup_oauth2client.py b/setup_oauth2client.py
index b02348b..19f14b5 100644
--- a/setup_oauth2client.py
+++ b/setup_oauth2client.py
@@ -24,7 +24,7 @@ packages = [
 ]
 
 install_requires = [
-    'httplib2>=0.7.7',
+    'httplib2>=0.8',
     'python-gflags',
     ]