From 8c9bf1ccebb378a9b14b3491ae503176404d0944 Mon Sep 17 00:00:00 2001
From: Richard Leland <rich@richleland.com>
Date: Fri, 8 Apr 2016 16:23:00 -0400
Subject: [PATCH] Bump version, update changelog

---
 AUTHORS.rst           |  1 +
 CHANGELOG.md          | 23 +++++++++++++++--------
 docs/conf.py          |  2 +-
 setup.py              |  6 +++---
 sparkpost/__init__.py |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 953822b..b56474f 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -15,6 +15,7 @@ Patches and suggestions
 - Marko Mrdjenovic `@friedcell <https://github.com/friedcell>`_
 - Zdeněk Softič `@btx <https://github.com/btx>`_
 - Simeon Visser `@svisser <https://github.com/svisser>`_
+- `@amatissart <https://github.com/amatissart>`_
 - `@gnarvaja <https://github.com/gnarvaja>`_
 - `@pegler <https://github.com/pegler>`_
 - `@puttu <https://github.com/puttu>`_
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f451237..2a576de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,21 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased][unreleased]
+## Unreleased
+- [Compare to latest release][unreleased]
+
+## [1.1.1] - 2016-04-08
+### Fixed
+- [#99](https://github.com/SparkPost/python-sparkpost/pull/99) Issue where inline images were always passed to the API, which in turn required HTML content
 
 ## [1.1.0] - 2016-03-30
 ### Added
-- Better extensibility with support for Tornado
-- Support for inline images
-- Support for specifying IP pool
+- [#94](https://github.com/SparkPost/python-sparkpost/pull/94) Better extensibility with support for Tornado
+- [#95](https://github.com/SparkPost/python-sparkpost/pull/95) Support for CSS inlining
+- [#98](https://github.com/SparkPost/python-sparkpost/pull/98) Support for inline images
+- [#98](https://github.com/SparkPost/python-sparkpost/pull/98) Support for specifying IP pool
 
 ### Fixed
-- Issue where substitution data was being improperly passed to the templates preview endpoint
-- Issue where Django backend was not properly base64 encoding attachments
+- [#97](https://github.com/SparkPost/python-sparkpost/pull/97) Issue where substitution data was being improperly passed to the templates preview endpoint
+- [#91](https://github.com/SparkPost/python-sparkpost/pull/91) Issue where Django backend was not properly base64 encoding attachments
 
 ## [1.0.5] - 2016-03-18
 ### Fixed
-- Issue where global Django settings object was being modified, causing mixed emails
+- [#89](https://github.com/SparkPost/python-sparkpost/pull/89) Issue where global Django settings object was being modified, causing mixed emails
 
 ## [1.0.4] - 2016-03-10
 ### Added
@@ -75,7 +81,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Metrics class for getting a list of campaigns and domains
 - Docs on readthedocs.org
 
-[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.0...HEAD
+[unreleased]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.1...HEAD
+[1.1.1]: https://github.com/sparkpost/python-sparkpost/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.5...v1.1.0
 [1.0.5]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.4...v1.0.5
 [1.0.4]: https://github.com/sparkpost/python-sparkpost/compare/v1.0.3...v1.0.4
diff --git a/docs/conf.py b/docs/conf.py
index 954991c..29f4935 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index a20a3d3..28834b8 100644
--- a/setup.py
+++ b/setup.py
@@ -6,9 +6,9 @@
 
 setup(
     name='sparkpost',
-    version='1.1.0',
-    author='Message Systems',
-    author_email='appteam@messagesystems.com',
+    version='1.1.1',
+    author='SparkPost',
+    author_email='developers@sparkpost.com',
     packages=find_packages(),
     url='https://github.com/SparkPost/python-sparkpost',
     license='Apache 2.0',
diff --git a/sparkpost/__init__.py b/sparkpost/__init__.py
index 46d8a2b..05d3051 100644
--- a/sparkpost/__init__.py
+++ b/sparkpost/__init__.py
@@ -9,7 +9,7 @@
 from .transmissions import Transmissions
 
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 
 class SparkPost(object):