Merge pull request doctrine#1590 from alcaeus/prepare-1.1.5

Prepare 1.1.5 release

Author: alcaeus

.travis.yml

@@ -38,7 +38,7 @@ install:
   - sudo mongo-orchestration start
 
 before_script:
-  - curl -XPUT http://localhost:8889/v1/sharded_clusters/myCluster --data @tests/sharded.json | python -m json.tool
+  - curl -XPUT http://localhost:8889/v1/sharded_clusters/myCluster --data @tests/sharded.json
   - composer self-update
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then yes '' | pecl -q install -f mongo-${DRIVER_VERSION}; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb-${DRIVER_VERSION}; fi

CHANGELOG-1.1.md

@@ -5,6 +5,14 @@ This changelog references the relevant changes done in 1.1 minor versions. If up
 1.0.x branch, please review
 [Upgrade Path](https://github.com/doctrine/mongodb-odm/blob/master/CHANGELOG-1.1.md#upgrade-path).
 
+1.1.5 (2017-05-13)
+------------------
+
+All issues and pull requests in this release may be found under the
+[1.1.5 milestone](https://github.com/doctrine/mongodb-odm/issues?q=milestone%3A1.1.5).
+
+* [#1588](https://github.com/doctrine/mongodb-odm/pull/1588) fixes field name translation for lock fields with a different name in the database.
+
 1.1.4 (2017-03-27)
 ------------------
 

docs/en/conf.py

@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.4'
+release = '1.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.