From: Sage Weil <sage@newdream.net>
Date: Tue, 26 Oct 2010 19:04:17 +0000 (-0700)
Subject: Merge remote branch 'origin/testing' into unstable
X-Git-Tag: v0.23~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ed57d2a6d92e1072fc38169ccd8acac799cdcbe;p=ceph.git

Merge remote branch 'origin/testing' into unstable

Conflicts:
	configure.ac
	src/rados.cc
---

2ed57d2a6d92e1072fc38169ccd8acac799cdcbe
diff --cc configure.ac
index 4fe1e330fe2c,3ec1d776bf8c..d8f857c41d5b
--- a/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@
  
  # Autoconf
  AC_PREREQ(2.59)
- AC_INIT([Ceph distributed file system], [.1], 
 -AC_INIT([Ceph distributed file system], [0.22.1], 
++AC_INIT([Ceph distributed file system], [0.23~rc], 
  	      [Sage Weil <sage@newdream.net>],
  	      [ceph])