Merge remote-tracking branch 'gh/next'

Conflicts:
	src/osd/ReplicatedPG.cc

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

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

diff --cc src/osd/ReplicatedPG.cc
index 5cd5f538dbe43ac714a62709b2825fecce40daef,9b4d069370bae2e8fe40bad13415201c80b2b4ff..7d1738da57256ec8f2e52eca8739acbe83b21511
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -2960,7 -2898,8 +2960,8 @@@ int ReplicatedPG::do_osd_ops(OpContext 
      case CEPH_OSD_OP_SETXATTR:
        ++ctx->num_write;
        {
-       if (op.xattr.value_len > cct->_conf->osd_max_attr_size) {
 -      if (g_conf->osd_max_attr_size > 0 &&
 -          op.xattr.value_len > g_conf->osd_max_attr_size) {
++      if (cct->_conf->osd_max_attr_size > 0 &&
++          op.xattr.value_len > cct->_conf->osd_max_attr_size) {
          result = -EFBIG;
          break;
        }

diff --cc src/test/librados/misc.cc
Simple merge