From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Feb 2016 13:48:26 +0000 (-0500)
Subject: Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph
X-Git-Tag: v10.0.4~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a80477432730632941a005fa24739ff301a4cb6;p=ceph.git

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

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

9a80477432730632941a005fa24739ff301a4cb6
diff --cc src/CMakeLists.txt
index a6d83c2ba2f8,6d5e38cfbb43..f677309970f6
--- a/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/mds/MDSRank.cc
index 6b8e2bb3a0f8,6e8cb76b270e..090982ecf0a9
--- a/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();