summaryrefslogtreecommitdiff
path: root/src/rabbit_basic.erl
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-12 15:24:25 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-12 15:24:25 +0000
commitc8dc2769a5a3ff3f064f3a74779c0cc17149b9ed (patch)
treee260de52024bbfbe8a2d617cef606a61eda0ebc8 /src/rabbit_basic.erl
parentf91d1b93da97d304643ebd8dc1110180bdf9d46e (diff)
parent4667154f152fb1a262d181121b9fbe23890f6090 (diff)
downloadrabbitmq-server-c8dc2769a5a3ff3f064f3a74779c0cc17149b9ed.tar.gz
merge default into bug20337
All tests pass. This also fixes the rabbit_guid rename.
Diffstat (limited to 'src/rabbit_basic.erl')
-rw-r--r--src/rabbit_basic.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index b8211d43..2777714f 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -19,7 +19,8 @@
-include("rabbit_framing.hrl").
-export([publish/4, publish/6, publish/1,
- message/3, message/4, properties/1, delivery/4]).
+ message/3, message/4, properties/1, delivery/4,
+ header_routes/1]).
-export([build_content/2, from_content/1]).
%%----------------------------------------------------------------------------