Merge remote-tracking branch 'upstream/jewel'

diff --cc ceph.spec.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debian/control
Simple merge

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

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

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

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

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

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

diff --cc src/librados/RadosClient.cc
Simple merge

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

diff --cc src/msg/Message.h
Simple merge

diff --cc src/msg/simple/Pipe.cc
Simple merge

diff --cc src/msg/simple/SimpleMessenger.cc
Simple merge

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

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

diff --cc src/osdc/Objecter.cc
index a8fa1e856305e6aed77b0ca0edc9cabe6cc11bfb,9d6df99093a072844c06b5ac0168664515f3c643..63d89f553ff9585898bf9269812e149be2413fc3
--- 1/src/osdc/Objecter.cc
--- 2/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -2001,10 -1924,9 +2002,10 @@@ void Objecter::tick(
  
    unsigned laggy_ops = 0;
  
 -  for (map<int,OSDSession*>::iterator siter = osd_sessions.begin(); siter != osd_sessions.end(); ++siter) {
 +  for (map<int,OSDSession*>::iterator siter = osd_sessions.begin();
 +       siter != osd_sessions.end(); ++siter) {
      OSDSession *s = siter->second;
-     RWLock::RLocker l(s->lock);
+     RWLock::WLocker l(s->lock);
      bool found = false;
      for (map<ceph_tid_t,Op*>::iterator p = s->ops.begin();
        p != s->ops.end();

diff --cc src/test/librbd/test_notify.py
Simple merge

diff --cc src/test/osd/TestPGLog.cc
Simple merge