Merge remote-tracking branch 'upstream/master'

health_manager/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'bundler', '>= 1.0.10'
-gem 'nats', :require => 'nats/client'
+gem 'nats', '~> 0.4.24', :require => 'nats/client'
 gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
 gem 'em-http-request', '~> 1.0.0.beta.3', :require => 'em-http'
 

health_manager/Gemfile.lock

@@ -56,12 +56,12 @@ GEM
       eventmachine
     http_parser.rb (0.5.3)
     interact (0.4.2)
-    json_pure (1.6.5)
+    json_pure (1.7.3)
     mime-types (1.18)
-    nats (0.4.22.beta.8)
-      daemons (>= 1.1.4)
+    nats (0.4.24)
+      daemons (>= 1.1.5)
       eventmachine (>= 0.12.10)
-      json_pure (>= 1.6.1)
+      json_pure (>= 1.7.3)
       thin (>= 1.3.1)
     posix-spawn (0.3.6)
     rack (1.4.1)
@@ -93,7 +93,7 @@ DEPENDENCIES
   ci_reporter
   em-http-request (~> 1.0.0.beta.3)
   eventmachine!
-  nats
+  nats (~> 0.4.24)
   rack
   rake
   rcov