diff options
| author | Rich Leland <rich.leland@messagesystems.com> | 2016-05-27 12:28:50 -0400 |
|---|---|---|
| committer | Rich Leland <rich.leland@messagesystems.com> | 2016-05-27 12:28:50 -0400 |
| commit | c8a00e3553d68a3d8827a45f53702fca4864934a (patch) | |
| tree | 61581325f9514bfaf0f7c531a4f6c4705b63a4e9 | |
| parent | 2ce818414fc06a33a68491148a48373470cc3d81 (diff) | |
| download | php-sparkpost-c8a00e3553d68a3d8827a45f53702fca4864934a.zip php-sparkpost-c8a00e3553d68a3d8827a45f53702fca4864934a.tar.gz php-sparkpost-c8a00e3553d68a3d8827a45f53702fca4864934a.tar.bz2 | |
Bump version, update changelog
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | lib/SparkPost/SparkPost.php | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cec2a92..44fc4c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] +## [1.2.1] - 2016-05-27 +### Fixed +- [#111](https://github.com/SparkPost/php-sparkpost/pull/111) allow pass through of timeout setting in http config + ## [1.2.0] - 2016-05-04 ### Added - [EditorConfig](http://editorconfig.org/) file to maintain consistent coding style @@ -52,8 +56,9 @@ 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/v1.2.0...HEAD -[1.2.0]: https://github.com/sparkpost/php-sparkpost/compare/v1.1.0...v1.2.0 +[unreleased]: https://github.com/sparkpost/php-sparkpost/compare/1.2.1...HEAD +[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 [1.1.0]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.3...v1.1.0 [1.0.3]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.2...v1.0.3 [1.0.2]: https://github.com/sparkpost/php-sparkpost/compare/v1.0.1...v1.0.2 diff --git a/lib/SparkPost/SparkPost.php b/lib/SparkPost/SparkPost.php index 6c6bd57..ff8b456 100644 --- a/lib/SparkPost/SparkPost.php +++ b/lib/SparkPost/SparkPost.php @@ -13,7 +13,7 @@ class SparkPost /** * Library version, used for setting User-Agent. */ - private $version = '1.2.0'; + private $version = '1.2.1'; /** * Connection config for making requests. |