Merge lp://staging/~lynxman/ubuntu/quantal/rabbitmq-server/rabbitmqserver282merge into lp://staging/ubuntu/quantal/rabbitmq-server

Proposed by Marc Cluet
Status: Merged
Merge reported by: Clint Byrum
Merged at revision: not available
Proposed branch: lp://staging/~lynxman/ubuntu/quantal/rabbitmq-server/rabbitmqserver282merge
Merge into: lp://staging/ubuntu/quantal/rabbitmq-server
Diff against target: 30611 lines (+11536/-9238)
394 files modified
.pc/.version (+0/-1)
.pc/applied-patches (+0/-1)
.pc/inets-plugins.patch/plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl (+0/-167)
LICENSE (+12/-12)
LICENSE-MPL-RabbitMQ (+1/-1)
Makefile (+15/-14)
codegen.py (+2/-2)
codegen/LICENSE-MPL-RabbitMQ (+1/-1)
codegen/amqp-rabbitmq-0.8.json (+1/-1)
codegen/amqp-rabbitmq-0.9.1.json (+1/-1)
codegen/amqp_codegen.py (+1/-1)
codegen/demo_extension.json (+1/-1)
codegen/license_info (+1/-1)
debian/LICENSE.head (+5/-0)
debian/LICENSE.tail (+516/-0)
debian/changelog (+45/-0)
debian/copyright (+73/-15)
debian/rabbitmq-script-wrapper (+2/-2)
debian/rabbitmq-server.default (+9/-0)
debian/rabbitmq-server.ocf (+1/-1)
docs/html-to-website-xml.xsl (+19/-27)
docs/rabbitmq-echopid.xml (+71/-0)
docs/rabbitmqctl.1.xml (+41/-13)
ebin/rabbit_app.in (+5/-1)
include/gm_specs.hrl (+1/-1)
include/rabbit.hrl (+5/-12)
include/rabbit_auth_backend_spec.hrl (+0/-31)
include/rabbit_auth_mechanism_spec.hrl (+0/-28)
include/rabbit_backing_queue_spec.hrl (+0/-66)
include/rabbit_exchange_type_spec.hrl (+0/-38)
include/rabbit_msg_store.hrl (+1/-1)
include/rabbit_msg_store_index.hrl (+0/-45)
plugins-src/Makefile (+3/-2)
plugins-src/do-package.mk (+4/-4)
plugins-src/eldap-wrapper/eldap-git/doc/draft-ietf-asid-ldap-c-api-00.txt (+0/-3030)
plugins-src/eldap-wrapper/package.mk (+1/-1)
plugins-src/eldap-wrapper/remove-ietf-doc.patch (+3036/-0)
plugins-src/erlando/README.md (+5/-3)
plugins-src/erlando/package.mk (+0/-1)
plugins-src/erlando/src/monad.erl (+8/-6)
plugins-src/erlando/test/erlando_test.erl (+1/-1)
plugins-src/erlando/test/src/test_do.erl (+1/-1)
plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_inets.erl (+8/-1)
plugins-src/erlang-rfc4627-wrapper/erlang-rfc4627-git/src/rfc4627_jsonrpc_registry.erl (+1/-1)
plugins-src/erlang-rfc4627-wrapper/fix-ets-leak.patch (+13/-0)
plugins-src/erlang-rfc4627-wrapper/package.mk (+2/-0)
plugins-src/licensing/LICENSE-MPL-RabbitMQ (+1/-1)
plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl.orig (+0/-715)
plugins-src/rabbitmq-auth-backend-ldap/README (+43/-12)
plugins-src/rabbitmq-auth-backend-ldap/package.mk (+1/-1)
plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap.erl (+75/-54)
plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_app.erl (+14/-29)
plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_sup.erl (+14/-29)
plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_util.erl (+14/-29)
plugins-src/rabbitmq-auth-backend-ldap/src/rabbitmq_auth_backend_ldap.app.src (+4/-2)
plugins-src/rabbitmq-auth-backend-ldap/test/src/rabbit_auth_backend_ldap_test.erl (+1/-1)
plugins-src/rabbitmq-auth-mechanism-ssl/README (+20/-2)
plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl.erl (+20/-53)
plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl_app.erl (+14/-29)
plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbitmq_auth_mechanism_ssl.app.src (+1/-1)
plugins-src/rabbitmq-consistent-hash-exchange/LICENSE-MPL-RabbitMQ (+1/-1)
plugins-src/rabbitmq-consistent-hash-exchange/src/rabbit_exchange_type_consistent_hash.erl (+1/-2)
plugins-src/rabbitmq-consistent-hash-exchange/test/src/rabbit_exchange_type_consistent_hash_test.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/Makefile (+7/-4)
plugins-src/rabbitmq-erlang-client/Makefile.in (+1/-1)
plugins-src/rabbitmq-erlang-client/README (+0/-181)
plugins-src/rabbitmq-erlang-client/README.in (+11/-0)
plugins-src/rabbitmq-erlang-client/common.mk (+1/-2)
plugins-src/rabbitmq-erlang-client/include/amqp_client.hrl (+1/-1)
plugins-src/rabbitmq-erlang-client/include/amqp_gen_consumer_spec.hrl (+3/-1)
plugins-src/rabbitmq-erlang-client/rabbit_common.app.in (+2/-0)
plugins-src/rabbitmq-erlang-client/src/amqp_auth_mechanisms.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_channel.erl (+119/-61)
plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup.erl (+4/-3)
plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup_sup.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_channels_manager.erl (+19/-5)
plugins-src/rabbitmq-erlang-client/src/amqp_client.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_connection.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_connection_sup.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_connection_type_sup.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_direct_connection.erl (+15/-5)
plugins-src/rabbitmq-erlang-client/src/amqp_direct_consumer.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_gen_connection.erl (+13/-8)
plugins-src/rabbitmq-erlang-client/src/amqp_gen_consumer.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_main_reader.erl (+37/-35)
plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl (+3/-3)
plugins-src/rabbitmq-erlang-client/src/amqp_rpc_client.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_rpc_server.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_selective_consumer.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_sup.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/amqp_uri.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/src/overview.edoc.in (+1/-1)
plugins-src/rabbitmq-erlang-client/src/uri_parser.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/test.mk (+1/-1)
plugins-src/rabbitmq-erlang-client/test/Makefile (+1/-1)
plugins-src/rabbitmq-erlang-client/test/amqp_client_SUITE.erl (+8/-3)
plugins-src/rabbitmq-erlang-client/test/amqp_dbg.erl (+1/-1)
plugins-src/rabbitmq-erlang-client/test/negative_test_util.erl (+3/-3)
plugins-src/rabbitmq-erlang-client/test/test_util.erl (+30/-2)
plugins-src/rabbitmq-federation-management/Makefile (+1/-0)
plugins-src/rabbitmq-federation-management/README (+8/-0)
plugins-src/rabbitmq-federation-management/package.mk (+7/-0)
plugins-src/rabbitmq-federation-management/priv/www/js/federation.js (+11/-0)
plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-links.ejs (+64/-0)
plugins-src/rabbitmq-federation-management/src/rabbit_federation_mgmt.erl (+100/-0)
plugins-src/rabbitmq-federation-management/src/rabbitmq_federation_management.app.src (+8/-0)
plugins-src/rabbitmq-federation/Makefile (+2/-0)
plugins-src/rabbitmq-federation/README (+4/-273)
plugins-src/rabbitmq-federation/etc/hare-no-federation.config (+1/-0)
plugins-src/rabbitmq-federation/etc/no_plugins (+1/-0)
plugins-src/rabbitmq-federation/include/rabbit_federation.hrl (+4/-2)
plugins-src/rabbitmq-federation/src/rabbit_federation_app.erl (+1/-1)
plugins-src/rabbitmq-federation/src/rabbit_federation_db.erl (+1/-1)
plugins-src/rabbitmq-federation/src/rabbit_federation_exchange.erl (+9/-19)
plugins-src/rabbitmq-federation/src/rabbit_federation_link.erl (+122/-74)
plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup.erl (+1/-1)
plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup_sup.erl (+50/-0)
plugins-src/rabbitmq-federation/src/rabbit_federation_status.erl (+91/-0)
plugins-src/rabbitmq-federation/src/rabbit_federation_sup.erl (+13/-20)
plugins-src/rabbitmq-federation/src/rabbit_federation_upstream.erl (+2/-1)
plugins-src/rabbitmq-federation/src/rabbit_federation_upstream_exchange.erl (+62/-0)
plugins-src/rabbitmq-federation/src/rabbit_federation_util.erl (+20/-2)
plugins-src/rabbitmq-federation/test/src/rabbit_federation_test.erl (+62/-4)
plugins-src/rabbitmq-federation/test/src/rabbit_federation_unit_test.erl (+1/-24)
plugins-src/rabbitmq-jsonrpc-channel-examples/src/rabbit_jsonrpc_channel_test_app.erl (+16/-0)
plugins-src/rabbitmq-jsonrpc-channel/README (+10/-4)
plugins-src/rabbitmq-jsonrpc-channel/priv/www/jsonrpc.js (+14/-29)
plugins-src/rabbitmq-jsonrpc-channel/priv/www/rabbitmq-jquery.js (+14/-30)
plugins-src/rabbitmq-jsonrpc-channel/priv/www/rabbitmq-prototype.js (+14/-30)
plugins-src/rabbitmq-jsonrpc-channel/priv/www/rabbitmq.js (+14/-30)
plugins-src/rabbitmq-jsonrpc-channel/src/rabbit_jsonrpc_channel.erl (+16/-30)
plugins-src/rabbitmq-jsonrpc-channel/src/rabbit_jsonrpc_channel_app.erl (+16/-0)
plugins-src/rabbitmq-jsonrpc-channel/src/rabbit_jsonrpc_channel_app_sup.erl (+16/-30)
plugins-src/rabbitmq-jsonrpc-channel/src/rabbit_jsonrpc_channel_factory.erl (+16/-30)
plugins-src/rabbitmq-jsonrpc-channel/src/rabbit_jsonrpc_channel_sup.erl (+16/-30)
plugins-src/rabbitmq-jsonrpc/src/rabbit_jsonrpc.erl (+16/-0)
plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_app.erl (+1/-1)
plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_sup.erl (+1/-1)
plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_db_handler.erl (+1/-1)
plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl (+52/-27)
plugins-src/rabbitmq-management-visualiser/LICENSE-MPL-RabbitMQ (+1/-1)
plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/model.js (+0/-1)
plugins-src/rabbitmq-management-visualiser/src/rabbit_mgmt_wm_all.erl (+1/-1)
plugins-src/rabbitmq-management-visualiser/src/rabbit_visualiser_mgmt.erl (+1/-1)
plugins-src/rabbitmq-management/LICENSE-MPL-RabbitMQ (+1/-1)
plugins-src/rabbitmq-management/Makefile (+22/-19)
plugins-src/rabbitmq-management/bin/rabbitmqadmin (+217/-71)
plugins-src/rabbitmq-management/etc/bunny.config (+1/-0)
plugins-src/rabbitmq-management/include/rabbit_mgmt.hrl (+1/-1)
plugins-src/rabbitmq-management/package.mk (+1/-0)
plugins-src/rabbitmq-management/priv/www/api/index.html (+8/-3)
plugins-src/rabbitmq-management/priv/www/css/main.css (+3/-0)
plugins-src/rabbitmq-management/priv/www/js/dispatcher.js (+6/-1)
plugins-src/rabbitmq-management/priv/www/js/formatters.js (+86/-23)
plugins-src/rabbitmq-management/priv/www/js/global.js (+11/-5)
plugins-src/rabbitmq-management/priv/www/js/help.js (+12/-1)
plugins-src/rabbitmq-management/priv/www/js/main.js (+4/-1)
plugins-src/rabbitmq-management/priv/www/js/tmpl/channels-list.ejs (+2/-3)
plugins-src/rabbitmq-management/priv/www/js/tmpl/connection.ejs (+6/-2)
plugins-src/rabbitmq-management/priv/www/js/tmpl/connections.ejs (+6/-4)
plugins-src/rabbitmq-management/priv/www/js/tmpl/exchange.ejs (+2/-53)
plugins-src/rabbitmq-management/priv/www/js/tmpl/exchanges.ejs (+8/-2)
plugins-src/rabbitmq-management/priv/www/js/tmpl/node.ejs (+25/-3)
plugins-src/rabbitmq-management/priv/www/js/tmpl/overview.ejs (+76/-10)
plugins-src/rabbitmq-management/priv/www/js/tmpl/permissions.ejs (+8/-9)
plugins-src/rabbitmq-management/priv/www/js/tmpl/publish.ejs (+63/-0)
plugins-src/rabbitmq-management/priv/www/js/tmpl/queue.ejs (+2/-0)
plugins-src/rabbitmq-management/priv/www/js/tmpl/queues.ejs (+11/-3)
plugins-src/rabbitmq-management/priv/www/js/tmpl/user.ejs (+48/-0)
plugins-src/rabbitmq-management/priv/www/js/tmpl/users.ejs (+9/-7)
plugins-src/rabbitmq-management/src/rabbit_mgmt_app.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_db.erl (+4/-11)
plugins-src/rabbitmq-management/src/rabbit_mgmt_dispatcher.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_extension.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_format.erl (+3/-11)
plugins-src/rabbitmq-management/src/rabbit_mgmt_load_definitions.erl (+48/-0)
plugins-src/rabbitmq-management/src/rabbit_mgmt_sup.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_util.erl (+4/-3)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_aliveness_test.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_binding.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_bindings.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channel.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channels.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection.erl (+2/-2)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection_channels.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connections.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_definitions.erl (+24/-18)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange_publish.erl (+5/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchanges.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_extensions.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_node.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_nodes.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_overview.erl (+6/-5)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permission.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_user.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_vhost.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_get.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_purge.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queues.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_user.erl (+13/-10)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_users.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhost.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhosts.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_whoami.erl (+1/-1)
plugins-src/rabbitmq-management/src/rabbitmq_management.app.src (+3/-2)
plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_all.erl (+1/-1)
plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_clustering.erl (+26/-6)
plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db.erl (+6/-3)
plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_http.erl (+18/-4)
plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_unit.erl (+1/-1)
plugins-src/rabbitmq-management/test/src/rabbitmqadmin-test.py (+188/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb_app.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb_registry.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb_sup.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb_util.erl (+14/-19)
plugins-src/rabbitmq-mochiweb/src/rabbit_mochiweb_web.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/src/rabbit_webmachine.erl (+1/-1)
plugins-src/rabbitmq-mochiweb/test/src/rabbit_mochiweb_test.erl (+16/-0)
plugins-src/rabbitmq-mochiweb/test/src/rabbit_mochiweb_test_unit.erl (+14/-19)
plugins-src/rabbitmq-shovel-management/README (+1/-2)
plugins-src/rabbitmq-shovel-management/src/rabbit_shovel_mgmt.erl (+1/-1)
plugins-src/rabbitmq-shovel/README (+4/-292)
plugins-src/rabbitmq-shovel/include/rabbit_shovel.hrl (+1/-1)
plugins-src/rabbitmq-shovel/src/rabbit_shovel.erl (+1/-1)
plugins-src/rabbitmq-shovel/src/rabbit_shovel_status.erl (+1/-1)
plugins-src/rabbitmq-shovel/src/rabbit_shovel_sup.erl (+1/-1)
plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker.erl (+1/-1)
plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test.erl (+1/-1)
plugins-src/rabbitmq-stomp/debian/compat (+0/-1)
plugins-src/rabbitmq-stomp/debian/control (+0/-13)
plugins-src/rabbitmq-stomp/debian/copyright (+0/-39)
plugins-src/rabbitmq-stomp/debian/rabbitmq-stomp.docs (+0/-2)
plugins-src/rabbitmq-stomp/debian/rabbitmq-stomp.install (+0/-1)
plugins-src/rabbitmq-stomp/debian/rules (+0/-40)
plugins-src/rabbitmq-stomp/include/rabbit_stomp.hrl (+4/-2)
plugins-src/rabbitmq-stomp/include/rabbit_stomp_frame.hrl (+16/-30)
plugins-src/rabbitmq-stomp/include/rabbit_stomp_headers.hrl (+4/-2)
plugins-src/rabbitmq-stomp/include/rabbit_stomp_prefixes.hrl (+3/-1)
plugins-src/rabbitmq-stomp/package.mk (+5/-3)
plugins-src/rabbitmq-stomp/src/rabbit_stomp.erl (+43/-67)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_client_sup.erl (+34/-43)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_frame.erl (+14/-29)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_processor.erl (+180/-183)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_reader.erl (+174/-79)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_sup.erl (+39/-66)
plugins-src/rabbitmq-stomp/src/rabbit_stomp_util.erl (+77/-41)
plugins-src/rabbitmq-stomp/src/rabbitmq_stomp.app.src (+2/-0)
plugins-src/rabbitmq-stomp/test/src/connect_options.py (+12/-4)
plugins-src/rabbitmq-stomp/test/src/destinations.py (+4/-1)
plugins-src/rabbitmq-stomp/test/src/non_ssl.config (+5/-6)
plugins-src/rabbitmq-stomp/test/src/parsing.py (+11/-7)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_amqqueue_test.erl (+46/-75)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_client.erl (+75/-0)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_publish_test.erl (+88/-0)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test.erl (+41/-0)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_frame.erl (+17/-21)
plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_util.erl (+26/-26)
plugins-src/rabbitmq-stomp/test/src/ssl.config (+11/-15)
plugins-src/rabbitmq-stomp/test/src/ssl_lifecycle.py (+24/-5)
plugins-src/rabbitmq-stomp/test/src/test_ssl.py (+2/-0)
plugins-src/rabbitmq-stomp/test/src/test_util.py (+42/-0)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_app.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer_sup.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_files.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_mgmt.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_sup.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_traces.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_files.erl (+1/-1)
plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_traces.erl (+1/-1)
plugins-src/rabbitmq-tracing/test/src/rabbit_tracing_test.erl (+1/-1)
scripts/rabbitmq-defaults (+30/-0)
scripts/rabbitmq-echopid.bat (+49/-0)
scripts/rabbitmq-env (+16/-6)
scripts/rabbitmq-plugins (+6/-3)
scripts/rabbitmq-plugins.bat (+1/-1)
scripts/rabbitmq-server (+18/-23)
scripts/rabbitmq-server.bat (+2/-2)
scripts/rabbitmq-service.bat (+2/-2)
scripts/rabbitmqctl (+7/-1)
scripts/rabbitmqctl.bat (+1/-1)
src/credit_flow.erl (+128/-0)
src/delegate.erl (+1/-1)
src/delegate_sup.erl (+1/-1)
src/dtree.erl (+163/-0)
src/file_handle_cache.erl (+17/-9)
src/gatherer.erl (+1/-1)
src/gen_server2.erl (+53/-14)
src/gm.erl (+57/-48)
src/gm_soak_test.erl (+1/-1)
src/gm_speed_test.erl (+1/-1)
src/gm_tests.erl (+1/-1)
src/lqueue.erl (+1/-1)
src/mirrored_supervisor.erl (+25/-68)
src/mirrored_supervisor_tests.erl (+2/-2)
src/mnesia_sync.erl (+77/-0)
src/pg_local.erl (+1/-1)
src/pmon.erl (+64/-0)
src/priority_queue.erl (+1/-1)
src/rabbit.erl (+71/-34)
src/rabbit_access_control.erl (+1/-2)
src/rabbit_alarm.erl (+64/-38)
src/rabbit_amqqueue.erl (+190/-63)
src/rabbit_amqqueue_process.erl (+411/-191)
src/rabbit_amqqueue_sup.erl (+1/-1)
src/rabbit_auth_backend.erl (+50/-35)
src/rabbit_auth_backend_internal.erl (+1/-3)
src/rabbit_auth_mechanism.erl (+34/-24)
src/rabbit_auth_mechanism_amqplain.erl (+1/-3)
src/rabbit_auth_mechanism_cr_demo.erl (+1/-3)
src/rabbit_auth_mechanism_plain.erl (+1/-3)
src/rabbit_backing_queue.erl (+196/-149)
src/rabbit_backing_queue_qc.erl (+5/-4)
src/rabbit_basic.erl (+43/-9)
src/rabbit_binary_generator.erl (+1/-1)
src/rabbit_binary_parser.erl (+1/-1)
src/rabbit_binding.erl (+3/-3)
src/rabbit_channel.erl (+209/-257)
src/rabbit_channel_sup.erl (+11/-11)
src/rabbit_channel_sup_sup.erl (+1/-1)
src/rabbit_client_sup.erl (+4/-3)
src/rabbit_command_assembler.erl (+1/-1)
src/rabbit_connection_sup.erl (+1/-1)
src/rabbit_control.erl (+26/-34)
src/rabbit_direct.erl (+10/-10)
src/rabbit_disk_monitor.erl (+196/-0)
src/rabbit_error_logger.erl (+1/-1)
src/rabbit_error_logger_file_h.erl (+1/-1)
src/rabbit_event.erl (+1/-1)
src/rabbit_exchange.erl (+20/-5)
src/rabbit_exchange_type.erl (+50/-32)
src/rabbit_exchange_type_direct.erl (+1/-2)
src/rabbit_exchange_type_fanout.erl (+1/-2)
src/rabbit_exchange_type_headers.erl (+1/-2)
src/rabbit_exchange_type_invalid.erl (+46/-0)
src/rabbit_exchange_type_topic.erl (+56/-70)
src/rabbit_file.erl (+1/-1)
src/rabbit_framing.erl (+1/-1)
src/rabbit_guid.erl (+72/-21)
src/rabbit_heartbeat.erl (+1/-1)
src/rabbit_limiter.erl (+1/-1)
src/rabbit_log.erl (+45/-71)
src/rabbit_memory_monitor.erl (+17/-25)
src/rabbit_mirror_queue_coordinator.erl (+16/-18)
src/rabbit_mirror_queue_master.erl (+25/-21)
src/rabbit_mirror_queue_misc.erl (+12/-9)
src/rabbit_mirror_queue_slave.erl (+111/-104)
src/rabbit_mirror_queue_slave_sup.erl (+1/-1)
src/rabbit_misc.erl (+91/-45)
src/rabbit_mnesia.erl (+45/-40)
src/rabbit_msg_file.erl (+1/-1)
src/rabbit_msg_store.erl (+45/-25)
src/rabbit_msg_store_ets_index.erl (+3/-3)
src/rabbit_msg_store_gc.erl (+1/-1)
src/rabbit_msg_store_index.erl (+28/-1)
src/rabbit_net.erl (+39/-6)
src/rabbit_networking.erl (+101/-81)
src/rabbit_node_monitor.erl (+14/-11)
src/rabbit_nodes.erl (+101/-0)
src/rabbit_plugins.erl (+24/-9)
src/rabbit_prelaunch.erl (+5/-19)
src/rabbit_queue_collector.erl (+18/-20)
src/rabbit_queue_index.erl (+55/-38)
src/rabbit_reader.erl (+150/-135)
src/rabbit_registry.erl (+1/-1)
src/rabbit_restartable_sup.erl (+3/-2)
src/rabbit_router.erl (+3/-59)
src/rabbit_sasl_report_file_h.erl (+1/-1)
src/rabbit_ssl.erl (+59/-16)
src/rabbit_sup.erl (+15/-11)
src/rabbit_tests.erl (+98/-38)
src/rabbit_tests_event_receiver.erl (+1/-1)
src/rabbit_trace.erl (+1/-1)
src/rabbit_types.erl (+9/-7)
src/rabbit_upgrade.erl (+11/-3)
src/rabbit_upgrade_functions.erl (+9/-1)
src/rabbit_variable_queue.erl (+80/-53)
src/rabbit_version.erl (+5/-2)
src/rabbit_vhost.erl (+1/-1)
src/rabbit_writer.erl (+63/-52)
src/supervisor2.erl (+183/-25)
src/tcp_acceptor.erl (+8/-25)
src/tcp_acceptor_sup.erl (+6/-2)
src/tcp_listener.erl (+11/-5)
src/tcp_listener_sup.erl (+9/-5)
src/test_sup.erl (+1/-1)
src/vm_memory_monitor.erl (+3/-3)
src/worker_pool.erl (+5/-4)
src/worker_pool_sup.erl (+1/-1)
src/worker_pool_worker.erl (+6/-6)
To merge this branch: bzr merge lp://staging/~lynxman/ubuntu/quantal/rabbitmq-server/rabbitmqserver282merge
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+111265@code.staging.launchpad.net

Description of the change

rabbitmq-server (2.8.2-2ubuntu1) quantal; urgency=low

  * Merge from debian unstable, remaining changes (LP: #1004373)
    - Plugin packages rabbitmq-common rabbitmq-stomp
      rabbitmq-erlang-client
    - debian/conf: Added config files for plugin packages
    - debian/control: Added definitions for plugins
    - debian/rules: Added support for deb multipackage source
    - debian/patches/inets-plugins.patch: Added patch for inet
      dependent plugins
    - debian/rabbitmq-server.init: Used our own init script with
      additional changes

 -- Marc Cluet <email address hidden> Wed, 20 Jun 2012 18:32:08 +0100

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Nicely done Marc, uploaded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: