merge bug22889 into default

majek · Jul 30, 2010 · d9b8aa5 · d9b8aa5
2 parents ff94026 + 3598bc2
commit d9b8aa5
Show file tree

Hide file tree

Showing 3 changed files with 447 additions and 39 deletions.
diff --git a/amqp-0.8.json → amqp-rabbitmq-0.8.json b/amqp-0.8.json → amqp-rabbitmq-0.8.json
@@ -289,7 +289,18 @@
 			 "synchronous" : true},
 			{"id": 41,
 			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "delete-ok"}
+			 "name": "delete-ok"},
+            {"id": 50,
+			 "arguments": [{"type": "short", "name": "ticket", "default-value": 1},
+				       {"type": "shortstr", "name": "queue"},
+				       {"type": "shortstr", "name": "exchange"},
+				       {"type": "shortstr", "name": "routing-key", "default-value": ""},
+				       {"type": "table", "name": "arguments", "default-value": {}}],
+			 "name": "unbind",
+			 "synchronous" : true},
+			{"id": 51,
+			 "arguments": [],
+			 "name": "unbind-ok"}
 			],
 	    "name": "queue"
 	},
@@ -375,7 +386,14 @@
 			 "name": "reject"},
 			{"id": 100,
 			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
-			 "name": "recover-async"}],
+			 "name": "recover-async"},
+            {"id": 110,
+			 "arguments": [{"type": "bit", "name": "requeue", "default-value": false}],
+			 "name": "recover",
+			 "synchronous" : true},
+			{"id": 111,
+			 "arguments": [],
+			 "name": "recover-ok"}],
 	    "name": "basic",
 	    "properties": [{"type": "shortstr", "name": "content-type"},
 			   {"type": "shortstr", "name": "content-encoding"},