Merge pull request #1455 from consul/scm-config

updates capistrano scm config

Capfile

@@ -12,6 +12,10 @@ require 'capistrano/delayed_job'
 require 'whenever/capistrano'
 require 'rvm1/capistrano3'
 
+#SCM: Git
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
+
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

config/deploy.rb

@@ -15,7 +15,6 @@ set :full_app_name, deploysecret(:full_app_name)
 set :server_name, deploysecret(:server_name)
 set :repo_url, 'https://github.com/consul/consul.git'
 
-set :scm, :git
 set :revision, `git rev-parse --short #{fetch(:branch)}`.strip
 
 set :log_level, :info