From: Sage Weil <sage@newdream.net>
Date: Wed, 18 May 2011 19:18:55 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.29~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4588bae5b06a7d76f33d13e406f39a09e3cc0f6;p=ceph.git

Merge branch 'stable'
---

d4588bae5b06a7d76f33d13e406f39a09e3cc0f6
diff --cc src/osdc/Objecter.h
index 6290a322cbe,819bcc76483..3044c01c93c
--- a/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 c285158a98a,0fc4f2c05ba..d7da94e977c
--- a/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