From: Brian Aker <brian@tangent.org>
Date: Fri, 24 Jun 2011 20:09:30 +0000 (-0700)
Subject: Merge in trunk. Updates to manual/update to latest libtest.
X-Git-Tag: 0.51~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=50dc8599f105fe915607e6f2d57851fd9acad839;hp=-c;p=m6w6%2Flibmemcached

Merge in trunk. Updates to manual/update to latest libtest.
---

50dc8599f105fe915607e6f2d57851fd9acad839
diff --combined ChangeLog
index 3e7cc639,200846cf..969eda06
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,10 @@@
- 0.50
- 
+ 0.50 Mon Jun 20 10:36:57 PDT 2011
   * Updates to C++ interface 
   * Custom free allocators need to now check for value before calling free.
- 
+  * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
+  * Fix for stats structure.
+  * Updates to documentation.
 + * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
  
  0.49 Thu Apr 14 08:43:37 PDT 2011
    * Fix calls to auto methods so that if value is not passed in nothing bad happens.
@@@ -11,8 -11,7 +12,6 @@@
    * New error system.
    * New flow control for messages means faster get/set calls.
    * Added new documentation system.
-   * A behavior change has been now made that if you specify a weight for any
-   server, we enable the weight flag and do weight balancing.
 -  * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.
    * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.  
    * Added MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS to simplify the setting of AUTO REJECT for servers.
  
diff --combined support/libmemcached.spec.in
index ccc093ea,69af8b41..337d1ec6
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@@ -83,11 -83,11 +83,11 @@@ you will need to install %{name}-devel
  %exclude %{_libdir}/libmemcachedutil.la
  %exclude %{_libdir}/libmemcachedprotocol.la
  %{_libdir}/libhashkit.so.1.0.0
- %{_libdir}/libmemcached.so.7.0.0
+ %{_libdir}/libmemcached.so.8.0.0
  %{_libdir}/libmemcachedutil.so.2.0.0
  %{_libdir}/libmemcachedprotocol.so.0.0.0
  %{_libdir}/libhashkit.so.1
- %{_libdir}/libmemcached.so.7
+ %{_libdir}/libmemcached.so.8
  %{_libdir}/libmemcachedprotocol.so.0
  %{_libdir}/libmemcachedutil.so.2
  %{_mandir}/man1/memcapable.1.gz
@@@ -114,13 -114,10 +114,13 @@@
  %{_includedir}/libhashkit/strerror.h
  %{_includedir}/libhashkit/types.h
  %{_includedir}/libhashkit/visibility.h
 +%{_includedir}/libhashkit/hashkit.hpp
 +
  %{_includedir}/libmemcached/allocators.h
  %{_includedir}/libmemcached/analyze.h
  %{_includedir}/libmemcached/array.h
  %{_includedir}/libmemcached/auto.h
 +%{_includedir}/libmemcached/basic_string.h
  %{_includedir}/libmemcached/behavior.h
  %{_includedir}/libmemcached/callback.h
  %{_includedir}/libmemcached/configure.h
@@@ -149,7 -146,6 +149,7 @@@
  %{_includedir}/libmemcached/protocol_handler.h
  %{_includedir}/libmemcached/quit.h
  %{_includedir}/libmemcached/result.h
 +%{_includedir}/libmemcached/return.h
  %{_includedir}/libmemcached/sasl.h
  %{_includedir}/libmemcached/server.h
  %{_includedir}/libmemcached/server_list.h