Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc configure.ac
Simple merge

diff --cc src/CMakeLists.txt
index a6d83c2ba2f86d636e5859003359c28014421d23,6d5e38cfbb435d0fcf4d56c02aceb4056e51d9cd..f677309970f66307418bfdf8d9ab71407a5d95be
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -662,8 -663,8 +663,8 @@@ endif(${HAVE_LIBFUSE}
  
  # make rocksdb statically
  add_custom_target(build_rocksdb
-     COMMAND 
+     COMMAND
 -    EXTRA_CXXFLAGS=-fPIC PORTABLE=1 make static_lib
 +    PORTABLE=1 $(MAKE) static_lib EXTRA_CXXFLAGS='-fPIC -Wno-unused-variable'
      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/rocksdb
      COMMENT "rocksdb building")
  

diff --cc src/Makefile-env.am
Simple merge

diff --cc src/common/Makefile.am
Simple merge

diff --cc src/common/ceph_context.cc
Simple merge

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

diff --cc src/log/Log.h
Simple merge

diff --cc src/mds/MDSDaemon.cc
Simple merge

diff --cc src/mds/MDSRank.cc
index 6b8e2bb3a0f8107e9374186100e078a94f7ea38c,6e8cb76b270ea1838d44b3aa1b6fcc5a93e0a3c0..090982ecf0a994f58038dfdadf35d16119e2c1a7
--- 1/src/mds/MDSRank.cc
--- 2/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@@ -1683,12 -1683,13 +1683,12 @@@ bool MDSRankDispatcher::handle_asok_com
    } else if (command == "osdmap barrier") {
      int64_t target_epoch = 0;
      bool got_val = cmd_getval(g_ceph_context, cmdmap, "target_epoch", target_epoch);
-     
+ 
      if (!got_val) {
        ss << "no target epoch given";
 -      delete f;
        return true;
      }
-     
+ 
      mds_lock.Lock();
      set_osd_epoch_barrier(target_epoch);
      mds_lock.Unlock();

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

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