Merge branch 'stable'

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

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

diff --cc src/include/rados.h
Simple merge

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

diff --cc src/os/FileStore.cc
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

diff --cc src/osdc/Objecter.h
index 6290a322cbef517c32d8838b4523e655fdb9963b,819bcc76483d4f31df4ba43f0f77e3679b46c484..3044c01c93ca309721ba5003369ae705b990cefb
--- 1/src/osdc/Objecter.h
--- 2/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@@ -323,9 -320,13 +323,13 @@@ public
        used_replica(false), con(NULL),
        snapid(CEPH_NOSNAP), outbl(0), flags(f), priority(0), onack(ac), oncommit(co), 
        tid(0), attempts(0),
 -      paused(false), objver(ov) {
 +      paused(false), objver(ov), reply_epoch(NULL) {
        ops.swap(op);
      }
+ 
+     bool operator<(const Op& other) const {
+       return tid < other.tid;
+     }
    };
  
    struct C_Stat : public Context {

diff --cc src/test/cli/crushtool/need_tree_order.crush
index c285158a98abd777114f1b580142cf6741548a37,0fc4f2c05ba2d93704fee081ab40be91aaf873d8..d7da94e977cc1d6f833beea71446a5f68415b8b0
--- 1/src/test/cli/crushtool/need_tree_order.crush
--- 2/src/test/cli/crushtool/need_tree_order.crush
+++ b/src/test/cli/crushtool/need_tree_order.crush
@@@ -1,53 -1,48 +1,53 @@@
  # begin crush map
  
  # devices
- device 0  device0
- device 1  device1
- device 2  device2
+ device 0 device0
+ device 1 device1
+ device 2 device2
  
  # types
- type 0  device
- type 1  host
- type 2  rack
- type 3  root
+ type 0 device
+ type 1 host
+ type 2 rack
+ type 3 root
  
  # buckets
-  host  host0 {
+ host host0 {
        id -1           # do not change unnecessarily
 +      # weight 1.000
        alg straw
        hash 0  # rjenkins1
-       item  device0 weight 1.000
+       item device0 weight 1.000
  }
-  host  host1 {
+ host host1 {
        id -2           # do not change unnecessarily
 +      # weight 1.000
        alg straw
        hash 0  # rjenkins1
-       item  device1 weight 1.000
+       item device1 weight 1.000
  }
-  host  host2 {
+ host host2 {
        id -5           # do not change unnecessarily
 +      # weight 1.000
        alg straw
        hash 0  # rjenkins1
-       item  device2 weight 1.000
+       item device2 weight 1.000
  }
-  rack  rack0 {
+ rack rack0 {
        id -3           # do not change unnecessarily
 +      # weight 3.000
        alg straw
        hash 0  # rjenkins1
-       item  host0 weight 1.000
-       item  host1 weight 1.000
-       item  host2 weight 1.000
+       item host0 weight 1.000
+       item host1 weight 1.000
+       item host2 weight 1.000
  }
-  root  root {
+ root root {
        id -4           # do not change unnecessarily
 +      # weight 4.000
        alg straw
        hash 0  # rjenkins1
-       item  rack0 weight 4.000
+       item rack0 weight 4.000
  }
  
  # rules