Permalink
Commits on Apr 29, 2014
  1. Merge branch '1.1.x'

    jmikola committed Apr 29, 2014
  2. Changelog entry for 1.1.6

    jmikola committed Apr 29, 2014
  3. Merge branch '1.0.x' into 1.1.x

    jmikola committed Apr 29, 2014
  4. Changelog entry for 1.0.9

    jmikola committed Apr 29, 2014
  5. Merge branch '1.1.x'

    jmikola committed Apr 29, 2014
  6. Merge pull request #179 from doctrine/1.1-createCollection-options

    Cast createCollection() options for MongoDB 2.6 compatibility
    jmikola committed Apr 29, 2014
  7. Cast createCollection() options for MongoDB 2.6 compatibility

    MongoDB 2.6 complains if the size/max options are non-numeric (e.g. null). See: doctrine/DoctrineMongoDBBundle#239
    jmikola committed Apr 29, 2014
Commits on Apr 22, 2014
  1. Merge branch '1.1.x'

    jmikola committed Apr 22, 2014
  2. Merge pull request #175

    jmikola committed Apr 22, 2014
  3. Make write option conversion consistent with convertWriteConcern()

    If the user supplies both the old and new write option (e.g. timeout and socketTimeoutMS), we shouldn't do anything. Only convert the deprecated option when the new option is not also present.
    jmikola committed Apr 22, 2014
  4. Convert deprecated write options for PHP Mongo driver >=1.5.0

    This transforms the deprecated "timeout" and "wtimeout" options to their respective counterparts ("socketTimeoutMS" and "wTimeoutMS") whenever this is applicable.
    Raymond Jelierse committed with jmikola Apr 21, 2014
Commits on Apr 21, 2014
  1. Merge branch '1.1.x'

    jmikola committed Apr 21, 2014
  2. Merge pull request #178 from doctrine/gh137

    Convert deprecated MongoClient constructor options for driver >= 1.4.0
    jmikola committed Apr 21, 2014
  3. Merge branch '1.1.x'

    jmikola committed Apr 21, 2014
  4. Merge branch '1.0.x' into 1.1.x

    Conflicts:
    	lib/Doctrine/MongoDB/Connection.php
    jmikola committed Apr 21, 2014
  5. Merge pull request #177 from doctrine/1.0-conn-ctor

    Respect $options when $server is null in Connection constructor
    jmikola committed Apr 21, 2014
Commits on Apr 18, 2014
  1. Merge branch '1.1.x'

    jmikola committed Apr 18, 2014
  2. Merge pull request #174

    jmikola committed Apr 18, 2014
  3. Merge branch '1.1.x'

    jmikola committed Apr 18, 2014
  4. Merge branch '1.0.x' into 1.1.x

    Conflicts:
    	.travis.yml
    jmikola committed Apr 18, 2014
  5. Merge pull request #176 from doctrine/1.0.x-travis

    Add new PHP and driver versions to Travis CI
    jmikola committed Apr 18, 2014
  6. Add driver 1.4.5 and 1.5.1 to test matrix

    Ensure the build prompt for 1.5.x is answered, similar to what was done in doctrine/mongodb-odm@4fe7d41
    jmikola committed Apr 18, 2014
Commits on Apr 10, 2014
  1. Merge branch '1.1.x'

    jmikola committed Apr 10, 2014
  2. Merge branch '1.0.x' into 1.1.x

    Conflicts:
    	lib/Doctrine/MongoDB/Collection.php
    jmikola committed Apr 10, 2014
  3. Merge pull request #172 from doctrine/1.0.x-ensureindex-wc

    Collection::ensureIndex() should convert write options (fixes #168)
    jmikola committed Apr 10, 2014
  4. Create branch alias for 1.2.x

    jmikola committed Apr 10, 2014
  5. Merge branch '1.1.x'

    jmikola committed Apr 10, 2014
  6. Remove branch alias for 1.1.x

    jmikola committed Apr 10, 2014
  7. Merge pull request #171 from doctrine/mindistance-option

    Implement $minDistance query operator and geoNear option
    jmikola committed Apr 10, 2014