Merge remote branch 'origin/stable' into next

diff --cc src/common/config.cc
index 8b4ce85b512511a2e9a0d7a16cbbb42775459cf5,7c1c77412816d0d573e2bfe70773eebd5ee24383..0794dcaa73fa40a1f53cf1b1747d370915e5b2bb
--- 1/src/common/config.cc
--- 2/src/common/config.cc
+++ b/src/common/config.cc
@@@ -372,9 -367,10 +372,10 @@@ struct config_option config_optionsp[] 
    OPTION(osd_auto_weight, OPT_BOOL, false),
    OPTION(osd_class_error_timeout, OPT_DOUBLE, 60.0),  // seconds
    OPTION(osd_class_timeout, OPT_DOUBLE, 60*60.0), // seconds
 -  OPTION(osd_class_tmp, OPT_STR, "/var/lib/ceph/tmp"),
 +  OPTION(osd_class_dir, OPT_STR, "/usr/lib/rados-classes"),
    OPTION(osd_check_for_log_corruption, OPT_BOOL, false),
    OPTION(osd_use_stale_snap, OPT_BOOL, false),
+   OPTION(osd_rollback_to_cluster_snap, OPT_STR, 0),
    OPTION(osd_max_notify_timeout, OPT_U32, 30), // max notify timeout in seconds
    OPTION(filestore, OPT_BOOL, false),
    OPTION(filestore_max_sync_interval, OPT_DOUBLE, 5),    // seconds

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

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

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/FileStore.h
Simple merge

diff --cc src/os/ObjectStore.h
Simple merge

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

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

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge