diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-02-02 11:26:55 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-02-02 11:26:55 +0000 |
| commit | 797bf891f92ea7968c21c71d78ce7132519f2fb7 (patch) | |
| tree | 2bf79250ae449b075f76d36df10ef4b2718ecd04 | |
| parent | 80548e1b1059692dd6584b38e7afbacbecb4cbdd (diff) | |
| parent | de6d80902fca7de57e600cfbc7405231ac5523fb (diff) | |
| download | rabbitmq-server-git-797bf891f92ea7968c21c71d78ce7132519f2fb7.tar.gz | |
Merge heads
| -rw-r--r-- | .hgignore | 2 | ||||
| -rw-r--r-- | src/rabbit_limiter.erl | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -20,6 +20,8 @@ syntax: regexp ^ebin/rabbit\.(app|rel|boot|script)$ ^plugins/ ^priv/plugins/ +^# +^\.# ^packaging/RPMS/Fedora/(BUILD|RPMS|SOURCES|SPECS|SRPMS)$ ^packaging/debs/Debian/rabbitmq-server_.*\.(dsc|(diff|tar)\.gz|deb|changes)$ diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index f32a187d32..82f4275a3e 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -22,7 +22,7 @@ %% %% Each channel has an associated limiter process, created with %% start_link/1, which it passes to queues on consumer creation with -%% rabbit_amqqueue:basic_consume/9, and rabbit_amqqueue:basic_get/4. +%% rabbit_amqqueue:basic_consume/10, and rabbit_amqqueue:basic_get/4. %% The latter isn't strictly necessary, since basic.get is not %% subject to limiting, but it means that whenever a queue knows about %% a channel, it also knows about its limiter, which is less fiddly. |