From 3033bfd79f778a22f4c0f81e074747c9818c4ad8 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Thu, 22 May 2014 14:20:32 +0900
Subject: [PATCH] update fluentd gem to v0.10.48+ for Supervisor
 default_options

---
 Gemfile.lock       | 6 +++---
 fluentd-ui.gemspec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e8640c..6d65f36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       bcrypt (~> 3.1.5)
       bundler (~> 1.5)
       coffee-rails (~> 4.0.0)
-      fluentd (= 0.10.46)
+      fluentd (~> 0.10.48)
       font-awesome-rails
       haml-rails (~> 0.5.3)
       httpclient
@@ -81,14 +81,14 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    fluentd (0.10.46)
+    fluentd (0.10.48)
       cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       sigdump (~> 0.2.2)
       yajl-ruby (~> 1.0)
-    font-awesome-rails (4.0.3.1)
+    font-awesome-rails (4.1.0.0)
       railties (>= 3.2, < 5.0)
     haml (4.0.5)
       tilt
diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec
index 5d63c53..d37dab8 100644
--- a/fluentd-ui.gemspec
+++ b/fluentd-ui.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", "0.10.46"
+  spec.add_dependency "fluentd", "~> 0.10.48"
   spec.add_dependency 'rails', '4.1.1'
   spec.add_dependency 'sucker_punch', "~> 1.0.5"
   spec.add_dependency 'i18n_generators', '1.2.1'