diff --git a/Gemfile b/Gemfile index 67d86607f..a667a4b4d 100644 --- a/Gemfile +++ b/Gemfile @@ -47,6 +47,7 @@ gem 'aws-sdk', '~> 2' gem 'ridley', '~> 4.2.0' gem "net-ssh" gem "net-scp" +gem "net-http-persistent", '~> 2.9.4' gem "knife-windows" gem "chef", "~> 12", require: false @@ -57,7 +58,6 @@ gem 'sidekiq' # for Active Job gem "sidekiq-cron", "~> 0.4.0" # for Scheduled Job gem 'foreman', require: false -gem "bootstrap-table-rails" # Temporarily set ruby_dep version to 1.3.1 because it requires ruby 2.2.5 that is not yet available on amazon linux gem "ruby_dep", "~> 1.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index e6bc0f4c4..0ac891f45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,6 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-table-rails (1.11.0) browserify-rails (3.2.0) addressable (>= 2.4.0) railties (>= 4.0.0, < 5.1) @@ -249,8 +248,7 @@ GEM named_let (0.2.0) rspec-core nenv (0.3.0) - net-http-persistent (3.0.0) - connection_pool (~> 2.2) + net-http-persistent (2.9.4) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -550,7 +548,6 @@ DEPENDENCIES aws-sdk-v1 better_errors binding_of_caller - bootstrap-table-rails browserify-rails bullet chef (~> 12) @@ -574,6 +571,7 @@ DEPENDENCIES libv8 mysql2 (~> 0.3.20) named_let + net-http-persistent (~> 2.9.4) net-scp net-ssh nokogiri (>= 1.6.8) @@ -620,4 +618,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.13.1 + 1.13.3 diff --git a/doc/installation/en/skyhopper.md b/doc/installation/en/skyhopper.md index 228ed178b..f034d558d 100644 --- a/doc/installation/en/skyhopper.md +++ b/doc/installation/en/skyhopper.md @@ -48,7 +48,8 @@ $ sudo npm install bower --global ```sh $ sudo yum groupinstall 'Development tools' 'Development Libraries' $ sudo yum install ruby22-devel sqlite-devel zlib-devel readline-devel openssl-devel libxml2-devel libxslt-devel mysql-devel mysql-server nginx -$ sudo yum --enablerepo=epel install redis +$ sudo rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm +$ sudo yum --enablerepo=remi,remi-test install redis ``` diff --git a/doc/installation/skyhopper.md b/doc/installation/skyhopper.md index 31b3b79a8..1e5948202 100644 --- a/doc/installation/skyhopper.md +++ b/doc/installation/skyhopper.md @@ -49,7 +49,8 @@ $ sudo npm install bower --global ```sh $ sudo yum groupinstall 'Development tools' 'Development Libraries' $ sudo yum install ruby22-devel sqlite-devel zlib-devel readline-devel openssl-devel libxml2-devel libxslt-devel mysql-devel mysql-server nginx -$ sudo yum --enablerepo=epel install redis +$ sudo rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm +$ sudo yum --enablerepo=remi,remi-test install redis ```