From ca4f270d5e6110b1b45e39ffb72dce16530e3da9 Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 30 Jul 2014 12:22:10 +0100
Subject: [PATCH] BUMP 1.5.5

---
 package.xml | 41 ++++++++++++++++++++++++++++++++++-------
 php_mongo.h |  2 +-
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/package.xml b/package.xml
index e47433648..a9df0045d 100644
--- a/package.xml
+++ b/package.xml
@@ -30,11 +30,11 @@
   <active>yes</active>
  </lead>
 
- <date>2014-06-17</date>
- <time>10:25:39</time>
+ <date>2014-07-30</date>
+ <time>12:10:39</time>
  <version>
-  <release>1.5.4</release>
-  <api>1.5.4</api>
+  <release>1.5.5</release>
+  <api>1.5.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -43,9 +43,16 @@
  <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
  <notes>
 ** Bug
-    * [PHP-1111] - MongoClient constructor crashes on connection to slave 
-    * [PHP-1118] - Aggregate cursor on non-existing collection throws weird error
-    * [PHP-1120] - The mongo driver fails to build as static extension
+    * [PHP-722] - Segfault when passing null value to MongoCollection::find() and unclear other conditions are met, inaccurate error message
+    * [PHP-1105] - long_as_object = 0 no effect
+    * [PHP-1107] - Connections to server hangs when indexes are being created
+    * [PHP-1131] - Journal option should set "j" field in GLE instead of "journal"
+
+** Documentation
+    * [PHP-840] - Document deprecated MongoClient properties
+    * [PHP-1081] - MongoId $id property is not documented correctly
+    * [PHP-1147] - Clean up GridFS insert/delete method documentation
+    * [PHP-1148] - Add "ssl" connection option to MongoClient changelog
  </notes>
 
  <contents>
@@ -216,6 +223,26 @@
 
  <changelog>
 
+  <release>
+   <date>2014-06-17</date>
+   <time>10:25:39</time>
+   <version>
+    <release>1.5.4</release>
+    <api>1.5.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
+   <notes>
+** Bug
+    * [PHP-1111] - MongoClient constructor crashes on connection to slave 
+    * [PHP-1118] - Aggregate cursor on non-existing collection throws weird error
+    * [PHP-1120] - The mongo driver fails to build as static extension
+   </notes>
+  </release>
+
   <release>
    <date>2014-06-05</date>
    <time>12:21:05</time>
diff --git a/php_mongo.h b/php_mongo.h
index a10efe86b..4dc3f2bcc 100644
--- a/php_mongo.h
+++ b/php_mongo.h
@@ -16,7 +16,7 @@
 #ifndef PHP_MONGO_H
 #define PHP_MONGO_H 1
 
-#define PHP_MONGO_VERSION "1.5.5dev"
+#define PHP_MONGO_VERSION "1.5.5"
 #define PHP_MONGO_EXTNAME "mongo"
 
 #ifdef HAVE_CONFIG_H