merge default into bug20173

8 files changed, 51 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index fede89e1..e19c0d56 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ srcdist: distclean
 	cp INSTALL.in $(TARGET_SRC_DIR)/INSTALL
 	elinks -dump -no-references -no-numbering $(WEB_URL)install.html \
 		>> $(TARGET_SRC_DIR)/INSTALL
-	cp BUILD.in $(TARGET_SRC_DIR)/BUILD
+	cp README.in $(TARGET_SRC_DIR)/README
 	elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
 		>> $(TARGET_SRC_DIR)/BUILD
 	sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in
diff --git a/BUILD.in b/README.in
index 0e70d0e7..0e70d0e7 100644
--- a/BUILD.in
+++ b/README.in
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index 692c4dc5..68c26b14 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -26,7 +26,7 @@ B<-n> I<node>
     startup time).  The output of hostname -s is usually the correct
     suffix to use after the "@" sign. See rabbitmq-server(1) for
     details of configuring the RabbitMQ broker.
-   
+
 B<-q>
     quiet output mode is selected with the B<-q> flag. Informational 
     messages are suppressed when quiet mode is in effect.
@@ -43,32 +43,32 @@ stop_app
     This command is typically run prior to performing other management
     actions that require the RabbitMQ application to be stopped,
     e.g. I<reset>.
-    
+
 start_app
     start the RabbitMQ application.
     This command is typically run prior to performing other management
     actions that require the RabbitMQ application to be stopped,
     e.g. I<reset>.
-    
+
 status
     display various information about the RabbitMQ broker, such as
     whether the RabbitMQ application on the current node, its version
     number, what nodes are part of the broker, which of these are
     running.
-    
+
 force
     return a RabbitMQ node to its virgin state.
     Removes the node from any cluster it belongs to, removes all data
     from the management database, such as configured users, vhosts and
     deletes all persistent messages.
-    
+
 force_reset
     the same as I<force> command, but resets the node unconditionally,
     regardless of the current management database state and cluster
     configuration.
     It should only be used as a last resort if the database or cluster
     configuration has been corrupted.
-    
+
 rotate_logs [suffix]
     instruct the RabbitMQ node to rotate the log files. The RabbitMQ
     broker will attempt to append the current contents of the log file
@@ -81,40 +81,43 @@ rotate_logs [suffix]
     specified.
     This command might be helpful when you are e.g. writing your own
     logrotate script and you do not want to restart the RabbitMQ node.
-    
+
 cluster I<clusternode> ...
     instruct the node to become member of a cluster with the specified
     nodes determined by I<clusternode> option(s).
     See http://www.rabbitmq.com/clustering.html for more information
     about clustering.
-    
+
 =head2 USER MANAGEMENT
-    
+
 add_user I<username> I<password>
     create a user named I<username> with (initial) password I<password>.
-    
+
+delete_user I<username>
+    delete the user named I<username>.
+
 change_password I<username> I<newpassword>
     change the password for the user named I<username> to I<newpassword>.
 
 list_users
     list all users.
-    
+
 =head2 ACCESS CONTROL
 
 add_vhost I<vhostpath>
     create a new virtual host called I<vhostpath>.
-    
+
 delete_vhost I<vhostpath>
     delete a virtual host I<vhostpath>.
     That command deletes also all its exchanges, queues and user mappings.
-    
+
 list_vhosts
     list all virtual hosts.
-    
+
 map_user_vhost I<username> I<vhostpath>
     grant the user named I<username> access to the virtual host called
     I<vhostpath>.
-    
+
 unmap_user_vhost I<username> I<vhostpath>
     deny the user named I<username> access to the virtual host called
     I<vhostpath>.
@@ -122,7 +125,7 @@ unmap_user_vhost I<username> I<vhostpath>
 list_user_vhost I<username> 
     list all the virtual hosts to which the user named I<username> has
     been granted access.
-    
+
 =head2 SERVER STATUS
 
 list_queues [-p I<vhostpath>] [I<queueinfoitem> ...]
@@ -146,8 +149,8 @@ auto_delete
 arguments
     queue arguments
 
-pid
-    Erlang process identifier associated with the queue
+node
+    node on which the process associated with the queue resides
 
 messages_ready
     number of messages ready to be delivered to clients
@@ -158,6 +161,9 @@ messages_unacknowledged
 messages_uncommitted
     number of messages published in as yet uncommitted transactions
 
+messages
+    sum of ready, unacknowledged and uncommitted messages
+
 acks_uncommitted
     number of acknowledgements received in as yet uncommitted
     transactions
@@ -212,8 +218,8 @@ list_connections [I<connectioninfoitem> ...]
 
 =over 4
 
-pid
-    Erlang process id associated with the connection
+node
+    node on which the process associated with the connection resides
 
 address
     server IP number
@@ -226,7 +232,7 @@ peer_address
 
 peer_port
     peer port
-    
+
 state
     connection state (B<pre-init>, B<starting>, B<tuning>, B<opening>,
     B<running>, B<closing>, B<closed>)
@@ -260,7 +266,7 @@ send_cnt
 
 send_pend
     send queue size
-    
+
 =back
 
 The list_queues, list_exchanges and list_bindings commands accept an
@@ -274,12 +280,12 @@ Create a user named foo with (initial) password bar at the Erlang node
 rabbit@test:
 
     rabbitmqctl -n rabbit@test add_user foo bar
-    
+
 Grant user named foo access to the virtual host called test at the
 default Erlang node:
 
     rabbitmqctl map_user_vhost foo test
-    
+
 Append the current logs' content to the files with ".1" suffix and reopen
 them:
 
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 241afd71..fc109bdb 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -118,6 +118,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon Jan 19 2009 Ben Hood <0x6e6562@gmail.com> 1.5.1-1
+- Maintenance release for the 1.5.x series
+
 * Wed Dec 17 2008 Matthias Radestock <matthias@lshift.net> 1.5.0-1
 - New upstream release
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index e8be8d8d..37b01dab 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.5.1-1) hardy; urgency=low
+
+  * New Upstream Release
+
+ -- Simon MacMullen <simon@lshift.net>  Mon, 19 Jan 2009 15:46:13 +0000
+
 rabbitmq-server (1.5.0-1) testing; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/watch b/packaging/debs/Debian/debian/watch
new file mode 100644
index 00000000..b41aff9a
--- /dev/null
+++ b/packaging/debs/Debian/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://www.rabbitmq.com/releases/rabbitmq-server/v(.*)/rabbitmq-server-(\d.*)\.tar\.gz \
+	debian uupdate
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 9d16fd9f..59101cb2 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -15,7 +15,7 @@ dist:
 	mv $(SOURCE_DIR)/scripts/rabbitmq-multi.bat $(SOURCE_DIR)/sbin
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
-	rm -f $(SOURCE_DIR)/BUILD
+	rm -f $(SOURCE_DIR)/README
 	rm -rf $(SOURCE_DIR)/docs
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 20a66ac5..532be26d 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -76,12 +76,12 @@ shutdown(undefined) ->
     ok;
 shutdown(LimiterPid) ->
     unlink(LimiterPid),
-    gen_server:cast(LimiterPid, shutdown).
+    gen_server2:cast(LimiterPid, shutdown).
 
 limit(undefined, 0) ->
     ok;
 limit(LimiterPid, PrefetchCount) ->
-    gen_server:cast(LimiterPid, {limit, PrefetchCount}).
+    gen_server2:cast(LimiterPid, {limit, PrefetchCount}).
 
 %% Ask the limiter whether the queue can deliver a message without
 %% breaching a limit
@@ -90,18 +90,18 @@ can_send(undefined, _QPid) ->
 can_send(LimiterPid, QPid) ->
     rabbit_misc:with_exit_handler(
       fun () -> true end,
-      fun () -> gen_server:call(LimiterPid, {can_send, QPid}) end).
+      fun () -> gen_server2:call(LimiterPid, {can_send, QPid}) end).
 
 %% Let the limiter know that the channel has received some acks from a
 %% consumer
 ack(undefined, _Count) -> ok;
-ack(LimiterPid, Count) -> gen_server:cast(LimiterPid, {ack, Count}).
+ack(LimiterPid, Count) -> gen_server2:cast(LimiterPid, {ack, Count}).
 
 register(undefined, _QPid) -> ok;
-register(LimiterPid, QPid) -> gen_server:cast(LimiterPid, {register, QPid}).
+register(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {register, QPid}).
 
 unregister(undefined, _QPid) -> ok;
-unregister(LimiterPid, QPid) -> gen_server:cast(LimiterPid, {unregister, QPid}).
+unregister(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {unregister, QPid}).
 
 %%----------------------------------------------------------------------------
 %% gen_server callbacks