Merge pull request #1021 from ruflin/release-3.0.0

Release 3.0.0
ruflin · Jan 4, 2016 · 5231de0 · 5231de0
2 parents a9e4936 + e741b13
commit 5231de0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,29 @@
 All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).
 
 
-## [Unreleased](https://github.com/ruflin/Elastica/compare/3.0.0-beta1...HEAD)
+## [Unreleased](https://github.com/ruflin/Elastica/compare/3.0.0...HEAD)
 
 ### Backward Compatibility Breaks
 
+### Bugfixes
+
+### Added
+
+### Improvements
+
+### Deprecated
+
+
+## [3.0.0](https://github.com/ruflin/Elastica/compare/3.0.0-beta1...3.0.0)
+
+### Backward Compatibility Breaks
+- Revert getError changes in Response object and make it better BC compatible. See comment [here](https://github.com/ruflin/Elastica/commit/41a7a2075837320bc9bd3bca4150e05a1ec9a115#commitcomment-15136374).
+
 ### Bugfixes
 - Function score query: corrected the `score_method` `average` to `avg` #975
 - Set `json_decode()` assoc parameter to true in `Elastica\Response` #1005
 - Add `bigintConversion` to keys passed to connection config in `Elastica\Client` #1005
 - Use POST instead of PUT to send bulk requests #1010
-- Revert getError changes in Response object and make it better BC compatible. See comment [here](https://github.com/ruflin/Elastica/commit/41a7a2075837320bc9bd3bca4150e05a1ec9a115#commitcomment-15136374).
 
 ### Added
 - Elastica\Query\MultiMatch::setFuzziness now supports being set to `AUTO` with the const `MultiMatch::FUZZINESS_AUTO`

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/test/lib/Elastica/Test/ResponseTest.php b/test/lib/Elastica/Test/ResponseTest.php
@@ -152,8 +152,6 @@ public function testArrayErrorMessage()
         $this->assertEquals(array('a', 'b'), $response->getFullError());
     }
 
-
-
     /**
      * @group unit
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,8 +152,6 @@ public function testArrayErrorMessage() @@
             $this->assertEquals(array('a', 'b'), $response->getFullError());
         }
         /**
          * @group unit
          */
@@ Expand Down @@