Fixing merge

diff --git a/ChangeLog b/ChangeLog
index f17c747528944f7f89f4b93c402dc96f15dfeae5..80ca4dc1c347d6bf4f53d1447d9856926678bc5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+  * Fix assert.h compile problem on CentOS
+
 0.19 Wed Apr  9 09:30:53 PDT 2008
   * Documentation fix in libmemcached.
   * Fixed bug where sort was always occuring on hosts

diff --git a/configure.ac b/configure.ac
index 01d43a2fdf1ee7b447fa13b637a8c938ab197454..ce8b576b543867d65c098acf5c48177f6dfddde4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ MEMCACHED_LIBRARY_NAME=libmemcached
 
 #release versioning
 MEMCACHED_MAJOR_VERSION=0
-MEMCACHED_MINOR_VERSION=19
+MEMCACHED_MINOR_VERSION=20
 MEMCACHED_MICRO_VERSION=0
 
 #API version

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 99c942d8cf6f3a3e8ecda4028192637a94050738..6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -31,12 +31,16 @@ extern "C" {
 #define MEMCACHED_VERSION_STRING_LENGTH 12
 
 /* string value */
+<<<<<<< local
 #define LIBMEMCACHED_VERSION_STRING "0.19"
 
 struct continuum_item{
        uint32_t index;
        uint32_t value;
 };
+=======
+#define LIBMEMCACHED_VERSION_STRING "0.20"
+>>>>>>> other
 
 struct memcached_stat_st {
   uint32_t pid;