Prepare release

php-http · Jul 18, 2016 · 67594a8 · 67594a8
1 parent 1e806aa
commit 67594a8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Change Log
 
 
+## 1.2.0 - 2016-07-18
+
+### Added
+
+- Support for cRUL constant names in configuration
+- Flexible and HTTP Methods client support
+- Discovery strategy to discover configured clients and/or add profiling
+
+### Changed
+
+- Improved collector to include plugin stack in profile data
+
+
 ## 1.1.1 - 2016-06-30
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "1.3-dev"
         }
     }
 }