From f0ef950117a7e8162f0b2875cb3b071be389d8d4 Mon Sep 17 00:00:00 2001
From: Rich Leland <rich.leland@messagesystems.com>
Date: Wed, 29 Jun 2016 18:07:20 -0400
Subject: [PATCH] Bump version, update changelog

---
 CHANGELOG.md                | 10 +++++++++-
 lib/SparkPost/SparkPost.php | 14 +++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61a467d..02d5681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [2.0.1] - 2016-06-29
+### Fixed
+- [#129](https://github.com/SparkPost/php-sparkpost/pull/129) issue with `content.from` being expected even when using a stored template
+
 ## [2.0.0] - 2016-06-24
+
+This major release included a complete refactor of the library to be a thin HTTP client layer with some sugar methods on the Transmission class. There is now a base resource that can be used to call any SparkPost API with a one to one mapping of payload parameters to what is listed in our API documentation.
+
 ### Changed
 - [#123](https://github.com/SparkPost/php-sparkpost/pull/123) Rewrote docs and updated composer name
 - [#122](https://github.com/SparkPost/php-sparkpost/pull/122) Add transmission class and examples
@@ -62,7 +69,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - README now has proper code blocks denoting PHP language
 
-[unreleased]: https://github.com/sparkpost/php-sparkpost/compare/1.2.1...HEAD
+[unreleased]: https://github.com/sparkpost/php-sparkpost/compare/2.0.1...HEAD
+[2.0.0]: https://github.com/sparkpost/php-sparkpost/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sparkpost/php-sparkpost/compare/1.2.1...2.0.0
 [1.2.1]: https://github.com/sparkpost/php-sparkpost/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/sparkpost/php-sparkpost/compare/v1.1.0...1.2.0
diff --git a/lib/SparkPost/SparkPost.php b/lib/SparkPost/SparkPost.php
index cbf761f..999eba4 100644
--- a/lib/SparkPost/SparkPost.php
+++ b/lib/SparkPost/SparkPost.php
@@ -11,7 +11,7 @@ class SparkPost
     /**
      * Library version, used for setting User-Agent.
      */
-    private $version = '2.0.0';
+    private $version = '2.0.1';
 
     /**
      * HttpClient used to make requests.
@@ -42,7 +42,7 @@ class SparkPost
 
     /**
      * Sets up the SparkPost instance.
-     * 
+     *
      * @param HttpClient $httpClient - An httplug client or adapter
      * @param array      $options    - An array to overide default options or a string to be used as an API key
      */
@@ -60,7 +60,7 @@ public function __construct(HttpClient $httpClient, $options)
      * @param string $uri
      * @param array  $payload - either used as the request body or url query params
      * @param array  $headers
-     * 
+     *
      * @return SparkPostPromise or SparkPostResponse depending on sync or async request
      */
     public function request($method = 'GET', $uri = '', $payload = [], $headers = [])
@@ -79,7 +79,7 @@ public function request($method = 'GET', $uri = '', $payload = [], $headers = []
      * @param string $uri
      * @param array  $payload
      * @param array  $headers
-     * 
+     *
      * @return SparkPostResponse
      *
      * @throws SparkPostException
@@ -101,7 +101,7 @@ public function syncRequest($method = 'GET', $uri = '', $payload = [], $headers
      * @param string $uri
      * @param array  $payload
      * @param array  $headers
-     * 
+     *
      * @return SparkPostPromise
      */
     public function asyncRequest($method = 'GET', $uri = '', $payload = [], $headers = [])
@@ -115,7 +115,7 @@ public function asyncRequest($method = 'GET', $uri = '', $payload = [], $headers
         }
     }
 
-    /** 
+    /**
      * Builds request from given params.
      *
      * @param string $method
@@ -191,7 +191,7 @@ public function getUrl($path, $params = [])
         return $options['protocol'].'://'.$options['host'].($options['port'] ? ':'.$options['port'] : '').'/api/'.$options['version'].'/'.$path.($paramsString ? '?'.$paramsString : '');
     }
 
-    /** 
+    /**
      * Sets $httpClient to be used for request.
      *
      * @param Http\Client\HttpClient $httpClient - the client to be used for request