Skip to content
This repository has been archived by the owner on Jul 11, 2020. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0824aff83644
Choose a base ref
...
head repository: rubygems/rubygems-chef
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52c0ca37f8cd
Choose a head ref
  • 2 commits
  • 17 files changed
  • 1 contributor

Commits on Sep 1, 2014

  1. Update gems and add knife-spork

    Sam Kottler committed Sep 1, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8014174 View commit details
  2. Merge upstream w/ fixed Gemfile.lock

    Sam Kottler committed Sep 1, 2014
    Copy the full SHA
    52c0ca3 View commit details
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
source 'https://rubygems.org'

gem 'berkshelf', '~> 3.0'
gem 'chef', '~> 11.12'
gem 'chef', '~> 11.14'
gem 'chef-vault', '~> 2.2.4'
gem 'chefspec', '~> 4.0'
gem 'foodcritic', '~> 4.0'
gem 'kitchen-docker'
gem 'kitchen-vagrant'
gem 'knife-ec2'
gem 'knife-backup'
gem 'knife-cookbook-cleanup'
gem 'knife-ec2'
gem 'knife-spork'
gem 'rubocop', '~> 0.23'
gem 'test-kitchen', '~> 1.0'
gem 'knife-cookbook-cleanup'
23 changes: 17 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ GEM
akami (1.2.2)
gyoku (>= 0.4.0)
nokogiri
app_conf (0.4.2)
ast (2.0.0)
berkshelf (3.1.5)
addressable (~> 2.3.4)
@@ -37,7 +38,7 @@ GEM
celluloid-io (0.16.0.pre2)
celluloid (>= 0.16.0.pre)
nio4r (>= 1.0.0)
chef (11.14.2)
chef (11.14.6)
chef-zero (~> 2.1, >= 2.1.4)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -52,6 +53,7 @@ GEM
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1)
ohai (~> 7.2)
plist (~> 3.1.0)
pry (~> 0.9)
rest-client (>= 1.0.4, <= 1.6.7)
chef-vault (2.2.4)
@@ -70,6 +72,7 @@ GEM
dep-selector-libgecode (~> 1.0)
ffi (~> 1.9)
diff-lcs (1.2.5)
diffy (3.0.6)
em-winrm (0.5.5)
eventmachine (~> 1.0.0)
mixlib-log (>= 1.3.0)
@@ -84,7 +87,7 @@ GEM
net-ssh
ohai
ffi (1.9.3)
ffi-yajl (1.0.2)
ffi-yajl (1.1.0)
ffi (~> 1.5)
libyajl2 (~> 1.0)
fog (1.20.0)
@@ -107,6 +110,7 @@ GEM
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
git (1.2.8)
gssapi (1.0.3)
ffi (>= 1.0.1)
gyoku (1.1.1)
@@ -130,6 +134,11 @@ GEM
knife-ec2 (0.8.0)
fog (~> 1.20.0)
knife-windows (>= 0.5.12)
knife-spork (1.4.1)
app_conf (>= 0.4.0)
chef (>= 11.0.0)
diffy (>= 3.0.1)
git (>= 1.2.5)
knife-windows (0.6.0)
em-winrm (~> 0.5, >= 0.5.4)
libyajl2 (1.0.1)
@@ -162,9 +171,9 @@ GEM
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
nori (1.1.5)
octokit (3.3.0)
octokit (3.3.1)
sawyer (~> 0.5.3)
ohai (7.2.2)
ohai (7.2.4)
ffi (~> 1.9)
ffi-yajl (~> 1.0)
ipaddress
@@ -178,9 +187,10 @@ GEM
parser (2.2.0.pre.4)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
plist (3.1.0)
polyglot (0.3.5)
powerpack (0.0.9)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
@@ -278,7 +288,7 @@ PLATFORMS

DEPENDENCIES
berkshelf (~> 3.0)
chef (~> 11.12)
chef (~> 11.14)
chef-vault (~> 2.2.4)
chefspec (~> 4.0)
foodcritic (~> 4.0)
@@ -287,5 +297,6 @@ DEPENDENCIES
knife-backup
knife-cookbook-cleanup
knife-ec2
knife-spork
rubocop (~> 0.23)
test-kitchen (~> 1.0)
Binary file added vendor/cache/app_conf-0.4.2.gem
Binary file not shown.
Binary file removed vendor/cache/chef-11.14.2.gem
Binary file not shown.
Binary file added vendor/cache/chef-11.14.6.gem
Binary file not shown.
Binary file added vendor/cache/diffy-3.0.6.gem
Binary file not shown.
Binary file removed vendor/cache/ffi-yajl-1.0.2.gem
Binary file not shown.
Binary file added vendor/cache/ffi-yajl-1.1.0.gem
Binary file not shown.
Binary file added vendor/cache/git-1.2.8.gem
Binary file not shown.
Binary file added vendor/cache/knife-spork-1.4.1.gem
Binary file not shown.
Binary file removed vendor/cache/octokit-3.3.0.gem
Binary file not shown.
Binary file added vendor/cache/octokit-3.3.1.gem
Binary file not shown.
Binary file removed vendor/cache/ohai-7.2.2.gem
Binary file not shown.
Binary file added vendor/cache/ohai-7.2.4.gem
Binary file not shown.
Binary file added vendor/cache/plist-3.1.0.gem
Binary file not shown.
Binary file removed vendor/cache/pry-0.10.0.gem
Binary file not shown.
Binary file added vendor/cache/pry-0.10.1.gem
Binary file not shown.