Merge branch '1.1.x'

doctrine · Feb 25, 2015 · 6343a46 · 6343a46
2 parents d9b284b + 5cd7ab2
commit 6343a46
Show file tree

Hide file tree

Showing 5 changed files with 494 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,2 @@
 phpunit.xml
-vendor
-composer.lock
-composer.phar
-
+vendor/
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -13,8 +13,14 @@ the older and newer versions, respectively.
 To generate a changelog summary since the last version, run
 `git log --no-merges --oneline XXX...1.0.x`
 
+1.0.11 (2015-02-24)
+-------------------
+
+ * e18ed83 Start tracking composer.lock in git
+ * 996a4d3 Allow ~2.1 for doctrine/common
+
 1.0.10 (2015-01-30)
-------------------
+-------------------
 
  * 7cc3ad0 Fix Connection::isConnected() for driver versions 1.5.0+
  * 2a68c2a Allow 1.6.x driver versions in composer.json

diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -4,6 +4,11 @@ CHANGELOG for 1.1.x
 This changelog references the relevant changes (bug and security fixes) done
 in 1.1.x patch versions.
 
+1.1.8 (2015-02-24)
+------------------
+
+ * [#207](https://github.com/doctrine/mongodb/pull/207): Bump doctrine/common dependency
+
 1.1.7 (2015-01-30)
 ------------------
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.3.2",
         "ext-mongo": ">=1.2.12,<1.7-dev",
-        "doctrine/common": ">=2.1.0,<2.5-dev"
+        "doctrine/common": "~2.1"
     },
     "require-dev": {
         "jmikola/geojson": "~1.0"