Merge branch 'wip-rgw-geo-2' into wip-rgw-geo

Conflicts:
	src/test/cli/radosgw-admin/help.t

diff --cc src/Makefile.am
index 21ab497f2cf23058aa8ab4669f353452683fa01b,245e5541a0bcf18dcb7c72efc9858344c91132c0..dff7489de434fb72a586c883c874c03448f17244
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -945,16 -976,16 +976,16 @@@ bin_DEBUGPROGRAMS += ceph_test_cor
  unittest_rgw_meta_SOURCES = test/test_rgw_admin_meta.cc
  unittest_rgw_meta_LDFLAGS = libglobal.la 
  unittest_rgw_meta_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
-  libcls_log_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
+  libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
  unittest_rgw_meta_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 -check_PROGRAMS += unittest_rgw_meta
 +bin_DEBUGPROGRAMS += unittest_rgw_meta
  
  unittest_rgw_log_SOURCES = test/test_rgw_admin_log.cc
  unittest_rgw_log_LDFLAGS = libglobal.la 
  unittest_rgw_log_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
-  libcls_log_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
+  libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
  unittest_rgw_log_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 -check_PROGRAMS += unittest_rgw_log
 +bin_DEBUGPROGRAMS += unittest_rgw_log
  endif
  
  ceph_test_librbd_SOURCES = test/librbd/test_librbd.cc test/librados/test.cc

diff --cc src/rgw/rgw_rados.cc
Simple merge