summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-04-19 11:37:24 -0700
committerTim Smith <tsmith@chef.io>2019-04-19 11:37:24 -0700
commit92da89dbe81641f4caea95a91747946eca45b904 (patch)
treebcd214c375a6ac5eed0b9dbb3e741a61057eb533
parent7dbdf1f9aacb9d3d16aa994fae7f750bb223c60b (diff)
downloadchef-92da89dbe81641f4caea95a91747946eca45b904.tar.gz
Pull train from master again
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 4c1d58cd83..f28838e38b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
gem "inspec-core", git: "https://github.com/inspec/inspec.git", branch: "master"
- gem "train-core", git: "https://github.com/inspec/train.git", branch: "ed25519"
+ gem "train-core", git: "https://github.com/inspec/train.git", branch: "master"
gem "chef-vault"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e50b8ce9f..4527a89eeb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,10 +57,10 @@ GIT
GIT
remote: https://github.com/inspec/train.git
- revision: d6c7b34d2b1d3558a6098614a5a09a96603979d8
- branch: ed25519
+ revision: e68511376de81172d69bcd3c773438b8754b9ee4
+ branch: master
specs:
- train-core (2.0.7)
+ train-core (2.0.8)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
json (>= 1.8, < 3.0)