summaryrefslogtreecommitdiffstats
path: root/bug22871.patch
blob: c15dc50d49833dca7bd29107a25c869e4ce5a0cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
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.