Merge branch '1.1.x'

Author: jmikola

CHANGELOG-1.0.md

@@ -13,6 +13,15 @@ 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.9 (2014-04-29)
+------------------
+
+ * 74cc098 Respect $options when $server is null in Connection constructor
+ * f8a382d Add driver 1.4.5 and 1.5.1 to test matrix
+ * 251ae2b Add PHP 5.6 and no longer allow failures for 5.5 builds
+ * 30aa713 Collection::ensureIndex() should convert write options (fixes #168)
+ * f781f2b Update issues/releases links in README
+
 1.0.8 (2014-03-28)
 ------------------
 

CHANGELOG-1.1.md

@@ -4,6 +4,17 @@ CHANGELOG for 1.1.x
 This changelog references the relevant changes (bug and security fixes) done
 in 1.1.x patch versions.
 
+1.1.6 (2014-04-29)
+------------------
+
+ * [#172](https://github.com/doctrine/mongodb/pull/172): `Collection::ensureIndex()` should convert write options
+ * [#174](https://github.com/doctrine/mongodb/pull/174): MongoDB 2.6: Ensure $in argument is a real BSON array
+ * [#175](https://github.com/doctrine/mongodb/pull/175): Convert timeout options for driver >= 1.5.0
+ * [#176](https://github.com/doctrine/mongodb/pull/176): Add new PHP and driver versions to Travis CI
+ * [#177](https://github.com/doctrine/mongodb/pull/177): Respect `$options` when `$server` is null in Connection constructor
+ * [#178](https://github.com/doctrine/mongodb/pull/178): Convert deprecated MongoClient constructor options for driver >= 1.4.0
+ * [#179](https://github.com/doctrine/mongodb/pull/179): Cast `createCollection()` options for MongoDB 2.6 compatibility
+
 1.1.5 (2014-03-28)
 ------------------