Merge pull request #372 from doctrine/3.2-changelog

Changelog for 3.2
doctrine · Jun 30, 2016 · e98a08a · e98a08a
2 parents 5298b26 + 129ab77
commit e98a08a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 9 deletions.
diff --git a/CHANGELOG-3.2.md b/CHANGELOG-3.2.md
@@ -0,0 +1,28 @@
+CHANGELOG for 3.2.x
+===================
+
+This changelog references the relevant changes done in 3.2 minor versions.
+
+To get the diff for a specific change, go to
+https://github.com/doctrine/DoctrineMongoDBBundle/commit/XXX
+where XXX is the commit hash. To get the diff between two versions, go to
+https://github.com/doctrine/DoctrineMongoDBBundle/compare/XXX...YYY
+where XXX and YYY are the older and newer versions, respectively.
+
+To generate a changelog summary since the last version, run
+`git log --no-merges --oneline XXX...HEAD`
+
+3.2.x-dev
+---------
+
+3.2.0 (2016-06-30)
+----------------------
+
+This release introduces compatibility with Custom Collections introduced in
+ODM 1.1. The minimum PHP version for this release is 5.6, same as for ODM.
+If you need support for older ODM version (1.0) or old PHP versions (< 5.6)
+please use the 3.1 release. The following Pull Requests were merged for this release:
+
+ * [#345](https://github.com/doctrine/DoctrineMongoDBBundle/pull/345) adds support for custom Collections
+ * [#369](https://github.com/doctrine/DoctrineMongoDBBundle/pull/369) fixes exit code of failed commands
+ * [#371](https://github.com/doctrine/DoctrineMongoDBBundle/pull/371) exposes configuration for `PersistentCollectionFactory`
diff --git a/Resources/doc/config.rst b/Resources/doc/config.rst
@@ -411,14 +411,15 @@ Full Default Configuration
 
                 # Prototype
                 id:
-                    connection:                 ~
-                    database:                   ~
-                    default_repository_class:   Doctrine\ODM\MongoDB\DocumentRepository
-                    repository_factory:         ~
-                    logging:                    true
-                    auto_mapping:               false
-                    retry_connect:              0
-                    retry_query:                0
+                    connection:                    ~
+                    database:                      ~
+                    default_repository_class:      Doctrine\ODM\MongoDB\DocumentRepository
+                    repository_factory:            ~
+                    persistent_collection_factory: ~
+                    logging:                       true
+                    auto_mapping:                  false
+                    retry_connect:                 0
+                    retry_query:                   0
                     metadata_cache_driver:
                         type:                 ~
                         class:                ~
@@ -462,8 +463,8 @@ Full Default Configuration
             hydrator_namespace:   Hydrators
             hydrator_dir:         "%kernel.cache_dir%/doctrine/odm/mongodb/Hydrators"
             auto_generate_hydrator_classes:  0
-            persistent_collection_dir: "%kernel.cache_dir%/doctrine/odm/mongodb/PersistentCollections"
             persistent_collection_namespace: PersistentCollections
+            persistent_collection_dir: "%kernel.cache_dir%/doctrine/odm/mongodb/PersistentCollections"
             auto_generate_persistent_collection_classes: 0
             default_document_manager:  ~
             default_connection:   ~