summaryrefslogtreecommitdiff
path: root/include/rabbit.hrl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-05 12:00:44 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-05 12:00:44 +0100
commit57d7c85c2ff057617815e0cfca7bc5072f2413f6 (patch)
treeb7f1ed23caef3b3e1d123f580799bc6005f103ea /include/rabbit.hrl
parent0a49575d4ab92e27b2b8633e0425419e1f1e112c (diff)
parente30c012241d4a041c36d6d1e1c9808492c355dd5 (diff)
downloadrabbitmq-server-git-57d7c85c2ff057617815e0cfca7bc5072f2413f6.tar.gz
merge from default, which was more effort than I'd expected. Also, started working through the java functional tests, discovered one bug in the mixed_queue (cancel not observing durable flag) and one bug in the amqqueue_process (not committing txns if there's no consumer pid).
Diffstat (limited to 'include/rabbit.hrl')
-rw-r--r--include/rabbit.hrl1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 0096ada1b8..50ddafbaef 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -146,6 +146,7 @@
host :: string() | atom(),
port :: non_neg_integer()}).
-type(not_found() :: {'error', 'not_found'}).
+-type(routing_result() :: 'routed' | 'unroutable' | 'not_delivered').
-endif.