summaryrefslogtreecommitdiffstats
path: root/bug22871.patch
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@fedoraproject.org>2010-06-28 00:19:59 +0000
committerHubert Plociniczak <hubert@fedoraproject.org>2010-06-28 00:19:59 +0000
commit7d96b2b7d1548523fd0b2fc53f9955b8325887fc (patch)
tree2ae35232493c0cb58cf8849cd8428782bc56d7ac /bug22871.patch
parent1b122495d692bf1052290fe7accd083e83a5d419 (diff)
downloadrabbitmq-server-7d96b2b7d1548523fd0b2fc53f9955b8325887fc.tar.gz
rabbitmq-server-7d96b2b7d1548523fd0b2fc53f9955b8325887fc.tar.xz
rabbitmq-server-7d96b2b7d1548523fd0b2fc53f9955b8325887fc.zip
New upstream release 1.8.0
Diffstat (limited to 'bug22871.patch')
-rw-r--r--bug22871.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/bug22871.patch b/bug22871.patch
new file mode 100644
index 0000000..c15dc50
--- /dev/null
+++ b/bug22871.patch
@@ -0,0 +1,37 @@
+diff -uNr rabbitmq-server-1.8.0/src/rabbit_amqqueue.erl rabbitmq-server-1.8.0patch0/src/rabbit_amqqueue.erl
+--- rabbitmq-server-1.8.0/src/rabbit_amqqueue.erl 2010-06-16 13:22:27.000000000 +0100
++++ rabbitmq-server-1.8.0patch0/src/rabbit_amqqueue.erl 2010-06-28 00:27:35.000000000 +0100
+@@ -110,7 +110,7 @@
+ -spec(internal_delete/1 :: (queue_name()) -> 'ok' | not_found()).
+ -spec(maybe_run_queue_via_backing_queue/2 :: (pid(), (fun ((A) -> A))) -> 'ok').
+ -spec(update_ram_duration/1 :: (pid()) -> 'ok').
+--spec(set_ram_duration_target/2 :: (pid(), number()) -> 'ok').
++-spec(set_ram_duration_target/2 :: (pid(), number() | 'infinity') -> 'ok').
+ -spec(set_maximum_since_use/2 :: (pid(), non_neg_integer()) -> 'ok').
+ -spec(on_node_down/1 :: (erlang_node()) -> 'ok').
+ -spec(pseudo_queue/2 :: (binary(), pid()) -> amqqueue()).
+diff -uNr rabbitmq-server-1.8.0/src/rabbit_exchange.erl rabbitmq-server-1.8.0patch0/src/rabbit_exchange.erl
+--- rabbitmq-server-1.8.0/src/rabbit_exchange.erl 2010-06-16 13:22:27.000000000 +0100
++++ rabbitmq-server-1.8.0patch0/src/rabbit_exchange.erl 2010-06-28 00:26:11.000000000 +0100
+@@ -100,7 +100,7 @@
+
+ %%----------------------------------------------------------------------------
+
+--define(INFO_KEYS, [name, type, durable, auto_delete, arguments].
++-define(INFO_KEYS, [name, type, durable, auto_delete, arguments]).
+
+ recover() ->
+ Exs = rabbit_misc:table_fold(
+diff -uNr rabbitmq-server-1.8.0/src/rabbit_memory_monitor.erl rabbitmq-server-1.8.0patch0/src/rabbit_memory_monitor.erl
+--- rabbitmq-server-1.8.0/src/rabbit_memory_monitor.erl 2010-06-16 13:22:27.000000000 +0100
++++ rabbitmq-server-1.8.0patch0/src/rabbit_memory_monitor.erl 2010-06-28 00:28:44.000000000 +0100
+@@ -90,7 +90,8 @@
+ -spec(update/0 :: () -> 'ok').
+ -spec(register/2 :: (pid(), {atom(),atom(),[any()]}) -> 'ok').
+ -spec(deregister/1 :: (pid()) -> 'ok').
+--spec(report_ram_duration/2 :: (pid(), float() | 'infinity') -> number()).
++-spec(report_ram_duration/2 :: (pid(), float() | 'infinity') ->
++ number() | 'infinity').
+ -spec(stop/0 :: () -> 'ok').
+
+ -endif.