Release 1.1.6

Signed-off-by: A. Jesse Jiryu Davis <[email protected]>

Author: ajdavis

Diff for: CMakeLists.txt

@@ -14,9 +14,9 @@ set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 set (MONGOC_MAJOR_VERSION 1)
 set (MONGOC_MINOR_VERSION 1)
 set (MONGOC_MICRO_VERSION 6)
-set (MONGOC_PRERELEASE_VERSION dev)
+set (MONGOC_PRERELEASE_VERSION )
 set (MONGOC_API_VERSION 1.0)
-set (MONGOC_VERSION 1.1.6-dev)
+set (MONGOC_VERSION 1.1.6)
 
 set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
 set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION})

Diff for: NEWS

@@ -8,8 +8,12 @@ This is a patch release with performance enhancements and bug fixes:
  * mongoc_bulk_operation_execute now coalesces consecutive update operations
    into a single message to a MongoDB 2.6+ server, yielding huge performance
    gains. Same for remove operations. (Inserts were always coalesced.)
- * Large batches of insert operations are now properly batched according to
+ * Large numbers of insert operations are now properly batched according to
    number of documents and total data size.
+ * GSSAPI / Kerberos auth now works.
+ * The driver no longer tries three times in vain to reconnect to a primary,
+   so socketTimeoutMS and connectTimeoutMS now behave *closer* to what you
+   expect for replica sets with down members. A full fix awaits 1.2.0.
 
 I snuck in a feature:
 

Diff for: README.rst

@@ -62,7 +62,7 @@ communications to ascertain the necessary details, delaying a useful response.
 Here is a made-up example of a help request that provides the relevant
 information:
 
-  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.1.5.tar.gz. I'm on Ubuntu
+  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.1.6.tar.gz. I'm on Ubuntu
   14.04, 64-bit Intel, with gcc 4.8.2. I run configure like::
 
     $ ./configure --enable-sasl=yes
@@ -95,13 +95,13 @@ Building from Release Tarball
 Unless you intend on contributing to the mongo-c-driver, you will want to build
 from a release tarball.
 
-The most current release is 1.1.5 which you can download here.
-`mongo-c-driver-1.1.5.tar.gz <https://github.com/mongodb/mongo-c-driver/releases/download/1.1.5/mongo-c-driver-1.1.5.tar.gz>`_.
+The most current release is 1.1.6 which you can download here.
+`mongo-c-driver-1.1.6.tar.gz <https://github.com/mongodb/mongo-c-driver/releases/download/1.1.6/mongo-c-driver-1.1.6.tar.gz>`_.
 
 To build on UNIX-like systems, do the following::
 
-  $ tar xzf mongo-c-driver-1.1.5.tar.gz
-  $ cd mongo-c-driver-1.1.5
+  $ tar xzf mongo-c-driver-1.1.6.tar.gz
+  $ cd mongo-c-driver-1.1.6
   $ ./configure
   $ make
   $ sudo make install
@@ -112,7 +112,7 @@ To see all of the options available to you during configuration, run::
 
 To build on Windows Vista or newer with Visual Studio 2010, do the following::
 
-  cd mongo-c-driver-1.1.5
+  cd mongo-c-driver-1.1.6
   cd src\libbson
   cmake -DCMAKE_INSTALL_PREFIX=C:\usr -G "Visual Studio 10 Win64" .
   msbuild.exe ALL_BUILD.vcxproj

Diff for: build/autotools/Versions.m4

@@ -1,7 +1,7 @@
 m4_define([mongoc_major_version], [1])
 m4_define([mongoc_minor_version], [1])
 m4_define([mongoc_micro_version], [6])
-m4_define([mongoc_prerelease_version], [dev])
+m4_define([mongoc_prerelease_version], [])
 
 m4_define(
     [mongoc_version],
@@ -12,13 +12,13 @@ m4_define(
 
 # bump up by 1 for every micro release with no API changes, otherwise
 # set to 0. after release, bump up by 1
-m4_define([mongoc_interface_age], [5])
+m4_define([mongoc_interface_age], [6])
 m4_define([mongoc_binary_age], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version)])
 
 m4_define([lt_current], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version - mongoc_interface_age)])
 m4_define([lt_revision], [mongoc_interface_age])
 m4_define([lt_age], [m4_eval(mongoc_binary_age - mongoc_interface_age)])
 
-m4_define([libbson_required_version], [1.1.5])
+m4_define([libbson_required_version], [1.1.6])
 
 m4_define([sasl_required_version], [2.1.6])

Diff for: build/rpm/mongo-c-driver.spec

@@ -1,9 +1,9 @@
 # norootforbuild
 
 %define DriverName    mongo-c-driver
-%define DriverVersion 1.1.5
+%define DriverVersion 1.1.6
 %define BsonName      libbson
-%define BsonVersion   1.1.5
+%define BsonVersion   1.1.6
 
 Name:           %{DriverName}
 Version:        %{DriverVersion}
@@ -117,6 +117,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{DriverName}
+* Tue May 18 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.6-1
+- Release 1.1.6
+
 * Tue May 12 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.5-1
 - Release 1.1.5
 
@@ -179,6 +182,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{BsonName}
+* Tue May 18 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.6-1
+- Release 1.1.6
+
 * Tue May 12 2015 A. Jesse Jiryu Davis <[email protected]> - 1.1.5-1
 - Release 1.1.5
 

Diff for: debian/changelog

@@ -1,3 +1,9 @@
+mongo-c-driver (1.1.6-0) unstable; urgency=low
+
+  * Release 1.1.6
+
+ -- A. Jesse Jiryu Davis <[email protected]>  Tue, 18 May 2015 12:00:00 -0400
+
 mongo-c-driver (1.1.5-0) unstable; urgency=low
 
   * Release 1.1.5

Diff for: doc/installing.page

@@ -58,11 +58,11 @@
 
     <p>The following instructions are for UNIX-like systems such as GNU/Linux, FreeBSD, and Solaris. To build on Windows, see the instructions for <link xref="installing#building-windows">Building on Windows</link>.</p>
 
-    <p>The most recent release of libmongoc is 1.1.5 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.1.5/mongo-c-driver-1.1.5.tar.gz">downloaded here</link>. The following snippet will download and extract the current release of the driver.</p>
+    <p>The most recent release of libmongoc is 1.1.6 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.1.6/mongo-c-driver-1.1.6.tar.gz">downloaded here</link>. The following snippet will download and extract the current release of the driver.</p>
 
-    <screen><output style="prompt">$ </output><input>wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.5/mongo-c-driver-1.1.5.tar.gz</input>
-<output style="prompt">$ </output><input>tar -xzf mongo-c-driver-1.1.5.tar.gz</input>
-<output style="prompt">$ </output><input>cd mongo-c-driver-1.1.5/</input></screen>
+    <screen><output style="prompt">$ </output><input>wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.6/mongo-c-driver-1.1.6.tar.gz</input>
+<output style="prompt">$ </output><input>tar -xzf mongo-c-driver-1.1.6.tar.gz</input>
+<output style="prompt">$ </output><input>cd mongo-c-driver-1.1.6/</input></screen>
 
     <p>Minimal dependencies are needed to build the MongoDB C driver. Optionally, if you want Kerberos (GSSAPI) or SSL support, you need to install <code>libsasl2</code> and <code>OpenSSL</code> libraries and development headers respectively.</p>
 
@@ -129,8 +129,8 @@ Install man pages                                : yes
     <p>The following commands will download the most recent MongoDB binary release and install it using the <code>pkgadd</code> command on Solaris 10.</p>
       <screen><output style="prompt">$ </output><input>bash</input>
 <output style="prompt">bash-3.2$ </output><input>export ARCH=`uname -m`</input>
-<output style="prompt">bash-3.2$ </output><input>/usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.1.5/MONGOmongo-c-driver-1.1.5.${ARCH}.pkg.tar.gz"</input>
-<output style="prompt">bash-3.2$ </output><input>gunzip -c "MONGOmongo-c-driver-1.1.5.${ARCH}.pkg.tar.gz" | tar -xf -</input>
+<output style="prompt">bash-3.2$ </output><input>/usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.1.6/MONGOmongo-c-driver-1.1.6.${ARCH}.pkg.tar.gz"</input>
+<output style="prompt">bash-3.2$ </output><input>gunzip -c "MONGOmongo-c-driver-1.1.6.${ARCH}.pkg.tar.gz" | tar -xf -</input>
 <output style="prompt">bash-3.2$ </output><input>pkgadd -d . MONGOmongo-c-driver</input></screen>
 
   </section>
@@ -142,7 +142,7 @@ Install man pages                                : yes
 
     <p>Let's start by generating Visual Studio project files for libbson, a dependency of the C driver. The following assumes we are compiling for 64-bit Windows using Visual Studio 2010 Express which can be freely downloaded from Microsoft.</p>
 
-    <screen>cd mongo-c-driver-1.1.5\src\libbson
+    <screen>cd mongo-c-driver-1.1.6\src\libbson
 cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</screen>
 
     <p>Now that we have project files generated, we can either open the project in Visual Studio or compile from the command line. Let's build using the command line program <code>msbuild.exe</code></p>
@@ -157,7 +157,7 @@ cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</sc
 
     <p>Now let's do the same for the MongoDB C driver.</p>
 
-    <screen>cd mongo-c-driver-1.1.5
+    <screen>cd mongo-c-driver-1.1.6
 cmake -G "Visual Studio 2010 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver" "-DBSON_ROOT_DIR=C:\mongo-c-driver"
 msbuild.exe ALL_BUILD.vcxproj
 msbuild.exe INSTALL.vcxproj</screen>

Diff for: doc/mongoc_version.page

@@ -17,8 +17,8 @@
 
 #define MONGOC_MAJOR_VERSION (1)
 #define MONGOC_MINOR_VERSION (1)
-#define MONGOC_MICRO_VERSION (5)
-#define MONGOC_VERSION_S     "1.1.5"
+#define MONGOC_MICRO_VERSION (6)
+#define MONGOC_VERSION_S     "1.1.6"
 #define MONGOC_VERSION_HEX   ((1 << 24) | (0 << 16) | (0 << 8) | 0)
 #define MONGOC_CHECK_VERSION(major, minor, micro)
 ]]></screen>