Merge branch 'master' of github.com:logstash/logstash

KooKed · Jul 17, 2013 · 8a5ced1 · 8a5ced1
2 parents 2d93385 + bbe41b8
commit 8a5ced1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/logstash/inputs/rabbitmq/hot_bunnies.rb b/lib/logstash/inputs/rabbitmq/hot_bunnies.rb
@@ -13,7 +13,8 @@ def register
       @settings = {
         :vhost => @vhost,
         :host  => @host,
-        :port  => @port
+        :port  => @port,
+        :user  => @user
       }
       @settings[:pass]      = @password.value if @password
       @settings[:tls]       = @ssl if @ssl

diff --git a/lib/logstash/outputs/rabbitmq/hot_bunnies.rb b/lib/logstash/outputs/rabbitmq/hot_bunnies.rb
@@ -87,7 +87,8 @@ def connect
       @settings = {
         :vhost => @vhost,
         :host  => @host,
-        :port  => @port
+        :port  => @port,
+        :user  => @user
       }
       @settings[:pass]      = if @password
                                 @password.value

diff --git a/logstash.gemspec b/logstash.gemspec
@@ -88,9 +88,9 @@ Gem::Specification.new do |gem|
   end
 
   if RUBY_PLATFORM != 'java'
-    gem.add_runtime_dependency "bunny",       ["~> 0.9.0.rc2"]  #(MIT license)
+    gem.add_runtime_dependency "bunny",       ["~> 0.9.1"]  #(MIT license)
   else
-    gem.add_runtime_dependency "hot_bunnies", ["~> 2.0.0.pre8"] #(MIT license)
+    gem.add_runtime_dependency "hot_bunnies", ["~> 2.0.0.pre9"] #(MIT license)
   end
 
   if RUBY_VERSION >= '1.9.1'