From a7713fd44da5c34456476766ea09f8f2b08d6652 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Mon, 11 May 2015 16:57:48 -0400
Subject: [PATCH] BUMP 1.6.8

---
 package.xml | 42 ++++++++++++++++++++++++++++++++----------
 php_mongo.h |  2 +-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/package.xml b/package.xml
index 527228f0c..c0b866bbc 100644
--- a/package.xml
+++ b/package.xml
@@ -30,11 +30,11 @@
   <active>yes</active>
  </lead>
 
- <date>2015-04-28</date>
- <time>17:05:00</time>
+ <date>2015-05-11</date>
+ <time>20:56:00</time>
  <version>
-  <release>1.6.7</release>
-  <api>1.6.7</api>
+  <release>1.6.8</release>
+  <api>1.6.8</api>
  </version>
  <stability>
   <release>stable</release>
@@ -43,14 +43,11 @@
  <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
  <notes>
 ** Bug
-    * [PHP-1425] - explain() does not raise appropriate exception for $err conditions
-    * [PHP-1431] - Fix database name validation to include '$external', to allow execution of user admin commands
-    * [PHP-1435] - MongoCollection::getIndexInfo on non-existing collection makes segmentation fault
+    * [PHP-1442] - php_mongo_stream_notify_io() segfault with stream context options
+    * [PHP-1445] - MongoClient does not accept boolean false as "ssl" option
 
 ** Improvement
-    * [PHP-1427] - MongoCollection::distinct() should ensure query is serialized as BSON object
-    * [PHP-1433] - MongoCollection::distinct() should allow array or object for query
-    * [PHP-1434] - MongoCollection::findAndModify() should allow array or object for query, update, and fields
+    * [PHP-1446] - Log original string values for parsed boolean options
  </notes>
 
  <contents>
@@ -220,6 +217,31 @@
  </extsrcrelease>
  <changelog>
 
+  <release>
+   <date>2015-04-28</date>
+   <time>17:05:00</time>
+   <version>
+    <release>1.6.7</release>
+    <api>1.6.7</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-1425] - explain() does not raise appropriate exception for $err conditions
+    * [PHP-1431] - Fix database name validation to include '$external', to allow execution of user admin commands
+    * [PHP-1435] - MongoCollection::getIndexInfo on non-existing collection makes segmentation fault
+
+** Improvement
+    * [PHP-1427] - MongoCollection::distinct() should ensure query is serialized as BSON object
+    * [PHP-1433] - MongoCollection::distinct() should allow array or object for query
+    * [PHP-1434] - MongoCollection::findAndModify() should allow array or object for query, update, and fields
+   </notes>
+  </release>
+
   <release>
    <date>2015-03-24</date>
    <time>10:46:05</time>
diff --git a/php_mongo.h b/php_mongo.h
index c1f271d05..5e2315731 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.6.8-dev"
+#define PHP_MONGO_VERSION "1.6.8"
 #define PHP_MONGO_EXTNAME "mongo"
 
 #ifdef HAVE_CONFIG_H