Merging Trond

diff --git a/ChangeLog b/ChangeLog
index 38de7da045ac8762cdb97b0c549937ab0c3add98..0da08589c1b17937324c56b87e37f177efe5ca33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+0.34 Tue Oct 13 08:39:51 PDT 2009
+  * Added support for setting behavior flags on a connection pool.
+  * Don't increment server_failure_counter on normal disconnects.
+  * Added prototype for a callback based protocol parser (server side)
+    with examples so that you could let your own application speak the
+    memcached protocol
   * Updated memcapable to test ASCII protocol.
   * Changed behavior so that server can be removed at first sign of failure.
   * Added memcached_server_get_last_disconnect() call

diff --git a/configure.ac b/configure.ac
index 951edfbfb44eb0c4530d138aef2713bbca9077cb..f1333afad7b0c34c1aef6dc296e195ac621b6c8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.33],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.34],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 5d58acbf27dce03a22ec53f4b7adf26818a34ecb..225b20990d1f2d6a4bec4de5cb1e8781b3fc8908 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 #define MEMCACHED_VERSION_STRING_LENGTH 24
-#define LIBMEMCACHED_VERSION_STRING "0.33"
+#define LIBMEMCACHED_VERSION_STRING "0.34"
 
 struct memcached_analysis_st {
   uint32_t average_item_size;

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 36fd047dba243b0d9d0ef54b1c3d3b90cef66fbf..1f340e468b85e6855f3a12a38f6e159a7a95c73d 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -80,9 +80,12 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libmemcached.la
 %exclude %{_libdir}/libmemcachedutil.a
+%exclude %{_libdir}/libmemcachedprotocol.a
 %exclude %{_libdir}/libmemcachedutil.la
+%exclude %{_libdir}/libmemcachedprotocol.la
 %{_libdir}/libmemcached.so.*
 %{_libdir}/libmemcachedutil.so.*
+%{_libdir}/libmemcachedprotocol.so.*
 %{_mandir}/man1/mem*
 
 
@@ -92,6 +95,7 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached
 %{_libdir}/libmemcached.so
 %{_libdir}/libmemcachedutil.so
+%{_libdir}/libmemcachedprotocol.so
 %{_libdir}/pkgconfig/libmemcached.pc
 %{_mandir}/man3/libmemcached*.3.gz
 %{_mandir}/man3/memcached_*.3.gz