Merge remote-tracking branch 'gh/wip-xio'

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/Makefile.am
Simple merge

diff --cc src/ceph_mon.cc
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/test/Makefile.am
index db8bafed49a074f27c409a6f38ccb0e229fd49d4,1dbf995048e2282746472aa363270d4dda57eea5..d36cb251c828f97d0489d5fb8d2bf62ae84c4bcf
--- 1/src/test/Makefile.am
--- 2/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@@ -383,8 -379,13 +384,8 @@@ unittest_throttle_LDADD = $(UNITTEST_LD
  unittest_throttle_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2
  check_PROGRAMS += unittest_throttle
  
 -unittest_crush_wrapper_SOURCES = test/crush/TestCrushWrapper.cc
 -unittest_crush_wrapper_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(LIBCRUSH)
 -unittest_crush_wrapper_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2
 -check_PROGRAMS += unittest_crush_wrapper
 -
  unittest_base64_SOURCES = test/base64.cc
- unittest_base64_LDADD = $(LIBCEPHFS) -lm $(UNITTEST_LDADD)
+ unittest_base64_LDADD = $(LIBCEPHFS) $(CEPH_GLOBAL) -lm $(UNITTEST_LDADD)
  unittest_base64_CXXFLAGS = $(UNITTEST_CXXFLAGS)
  check_PROGRAMS += unittest_base64
  

diff --cc src/test/ceph-helpers.sh
Simple merge