Index: /trunk/server/ChangeLog
===================================================================
--- /trunk/server/ChangeLog (revision 711)
+++ /trunk/server/ChangeLog (revision 741)
@@ -1,2 +1,16 @@
+2008-03-02 [Version 1.2.5-rc1 released]
+
+       * Add per-item-class tracking of evictions and OOM errors (dormando)
+
+       * Optimize item_alloc() a little (dormando)
+
+       * Give 'SERVER_ERROR out of memory' errors more context (dormando)
+
+       * Enable usage of large memory pages under solaris
+         (Trond.Norbye@Sun.COM)
+
+       * Enable UDP by default, clean up server socket code
+         (brian@tangent.org)
+
        * 'noreply' support (Tomash Brechko)
 
Index: /trunk/server/memcached.spec
===================================================================
--- /trunk/server/memcached.spec (revision 648)
+++ /trunk/server/memcached.spec (revision 741)
@@ -1,4 +1,4 @@
 Name:           memcached
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
Index: /trunk/server/configure.ac
===================================================================
--- /trunk/server/configure.ac (revision 724)
+++ /trunk/server/configure.ac (revision 741)
@@ -1,4 +1,4 @@
 AC_PREREQ(2.52)
-AC_INIT(memcached, 1.2.4, brad@danga.com)
+AC_INIT(memcached, 1.2.5, brad@danga.com)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR(memcached.c)