]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 24 Aug 2015 12:35:06 +0000 (08:35 -0400)
committerSage Weil <sage@redhat.com>
Mon, 24 Aug 2015 12:35:06 +0000 (08:35 -0400)
1  2 
configure.ac
src/rgw/rgw_rados.cc

diff --cc configure.ac
index 6a1ab8a0d2fbb73be3cab234da0f05b7fd41a04f,75017680ba115458c71f6d45c33b8c9abebad6db..b6a686d98bb24f1ec105070a43be188ef0949881
@@@ -8,10 -8,8 +8,10 @@@ AC_PREREQ(2.59
  # VERSION define is not used by the code.  It gets a version string
  # from 'git describe'; see src/ceph_ver.[ch]
  
- AC_INIT([ceph], [9.0.2], [ceph-devel@vger.kernel.org])
+ AC_INIT([ceph], [9.0.3], [ceph-devel@vger.kernel.org])
  
 +AX_CXX_COMPILE_STDCXX_11(, mandatory)
 +
  # Create release string.  Used with VERSION for RPMs.
  RPM_RELEASE=0
  AC_SUBST(RPM_RELEASE)
Simple merge