From c6cd88988debbfda18d1d933ff02b0027116fd16 Mon Sep 17 00:00:00 2001
From: Jeffrey Meadows <jmeadows@box.com>
Date: Mon, 2 Mar 2015 12:36:21 -0800
Subject: [PATCH] Bump version to 1.1.0.

Add HISTORY file to track changes.
---
 HISTORY.rst | 28 ++++++++++++++++++++++++++++
 setup.py    |  2 +-
 tox.ini     |  8 +++++---
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 HISTORY.rst

diff --git a/HISTORY.rst b/HISTORY.rst
new file mode 100644
index 000000000..5b2d91070
--- /dev/null
+++ b/HISTORY.rst
@@ -0,0 +1,28 @@
+.. :changelog:
+
+Release History
+---------------
+
+1.1.0 (2015-03-02)
+++++++++++++++++++
+
+**Features**
+
+- The SDK now supports Box metadata. See the `metadata docs <https://developers.box.com/metadata-api/>`_ for
+  more information.
+
+- The object paging API has been improved. SDK extensions that need fine-grained control over when the next "page"
+  of API results will be fetched can now do that.
+
+**Example Code**
+
+- The example code has been improved to be more robust and to work with all Python versions supported by the SDK
+  (CPython 2.6-2.7, CPython 3.3-3.4, and PyPy).
+
+- The example code has an example on how to use the new metadata feature.
+
+- The README has improved code examples.
+
+**Bugfixes**
+
+- Oauth2 redirect URIs containing non-ASCII characters are now supported.
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a58206c18..cd135583f 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ def main():
         install_requires.append('ordereddict>=1.1')
     setup(
         name='boxsdk',
-        version='1.0.2',
+        version='1.1.0',
         description='Official Box Python SDK',
         long_description=open(join(base_dir, 'README.rst')).read(),
         author='Box',
diff --git a/tox.ini b/tox.ini
index 71cd9cde2..211ff3d8a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ envlist =
   pypy,
   pep8,
   pylint,
-  readme,
+  rst,
   docs,
   coverage
 
@@ -21,11 +21,13 @@ commands =
   py.test test/ {posargs}
 deps = -rrequirements-dev.txt
 
-[testenv:readme]
+[testenv:rst]
 deps =
     docutils
     pygments
-commands = rst2html.py --strict README.rst
+commands =
+  rst2html.py --strict README.rst
+  rst2html.py --strict HISTORY.rst
 
 [testenv:pep8]
 commands =