diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2009-11-24 11:24:43 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2009-11-24 11:24:43 +0000 |
| commit | eab18481fa7c4790fa435af97a9c487204820ebf (patch) | |
| tree | 8e08f312836efd951be7a6f44b300ddfb129a51a /include | |
| parent | 210421063e374da609a5e00c21d555439cf17b8d (diff) | |
| parent | 1022dc07a5ef997eb40efe8d0ec00cf2621b244f (diff) | |
| download | rabbitmq-server-git-eab18481fa7c4790fa435af97a9c487204820ebf.tar.gz | |
Merge default in. This includes bug22020. There were some
non-obvious conflict resolutions:
- getting rid of the q/x durability agreement check
- in getting rid of the exchange may_auto_deleting, making sure all
branches returned 'ok' (the tests all start failing!).
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_exchange_behaviour_spec.hrl | 41 | ||||
| -rw-r--r-- | include/rabbit_framing_spec.hrl | 2 |
2 files changed, 42 insertions, 1 deletions
diff --git a/include/rabbit_exchange_behaviour_spec.hrl b/include/rabbit_exchange_behaviour_spec.hrl new file mode 100644 index 0000000000..30662af84a --- /dev/null +++ b/include/rabbit_exchange_behaviour_spec.hrl @@ -0,0 +1,41 @@ +%% The contents of this file are subject to the Mozilla Public License +%% Version 1.1 (the "License"); you may not use this file except in +%% compliance with the License. You may obtain a copy of the License at +%% http://www.mozilla.org/MPL/ +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +%% License for the specific language governing rights and limitations +%% under the License. +%% +%% The Original Code is RabbitMQ. +%% +%% The Initial Developers of the Original Code are LShift Ltd, +%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. +%% +%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +%% Technologies LLC, and Rabbit Technologies Ltd. +%% +%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +%% Ltd. Portions created by Cohesive Financial Technologies LLC are +%% Copyright (C) 2007-2009 Cohesive Financial Technologies +%% LLC. Portions created by Rabbit Technologies Ltd are Copyright +%% (C) 2007-2009 Rabbit Technologies Ltd. +%% +%% All Rights Reserved. +%% +%% Contributor(s): ______________________________________. +%% +-ifdef(use_specs). + +-spec(description/0 :: () -> [{atom(), any()}]). +-spec(publish/2 :: (exchange(), delivery()) -> {routing_result(), [pid()]}). +-spec(recover/1 :: (exchange()) -> 'ok'). +-spec(init/1 :: (exchange()) -> 'ok'). +-spec(delete/1 :: (exchange()) -> 'ok'). +-spec(add_binding/2 :: (exchange(), binding()) -> 'ok'). +-spec(delete_binding/2 :: (exchange(), binding()) -> 'ok'). + +-endif. diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl index a78c230167..16af8ad3bc 100644 --- a/include/rabbit_framing_spec.hrl +++ b/include/rabbit_framing_spec.hrl @@ -56,5 +56,5 @@ -type(password() :: binary()). -type(vhost() :: binary()). -type(ctag() :: binary()). --type(exchange_type() :: 'direct' | 'topic' | 'fanout'). +-type(exchange_type() :: atom()). -type(binding_key() :: binary()). |