Merge branch 'pr198'

* pr198:
  Remove needless --use-v1-config option
  Update README URLs based on HTTP redirects

README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui)
 [![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui)
 
-fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
+fluentd-ui is a browser-based [fluentd](http://www.fluentd.org) and [td-agent](https://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
 
 * Install, uninstall, and upgrade Fluentd plugins
 * start/stop/restart fluentd process
@@ -28,7 +28,7 @@ And some additional packages (Debian / Ubuntu)
 
 ## Development
 
-    $ git clone https://github.com/treasure-data/fluentd-ui
+    $ git clone https://github.com/fluent/fluentd-ui
     $ cd fluentd-ui
     $ bundle install
     $ bundle exec rails s

app/models/fluentd/agent/process_operation.rb

@@ -50,7 +50,6 @@ class Fluentd
 
       def options_to_argv(opts = {})
         argv = ""
-        argv << " --use-v1-config"
         argv << " -c #{opts[:config_file] || config_file}"
         argv << " -d #{opts[:pid_file] || pid_file}"
         argv << " -o #{opts[:log_file] || log_file}"

spec/models/fluentd/agent_spec.rb

@@ -18,7 +18,6 @@ describe Fluentd::Agent do
       it { should include("-c #{instance.config_file}") }
       it { should include("-d #{instance.pid_file}") }
       it { should include("-o #{instance.log_file}") }
-      it { should include("--use-v1-config") }
     end
 
     describe "#start" do