atomaka/my-boxen
1
0
Fork 0
Code Releases Activity

Merge pull request #561 from skottler/bugs/560

Browse source 
Add deep_merge to the Gemfile(.lock) and vendor it
This commit is contained in:
Rafael Mendonça França 2014-04-01 13:45:48 -05:00
commit 9e09639bec
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -9,6 +9,7 @@ gem "puppetlabs_spec_helper", "0.4.1"
gem "open4", "~> 1.3.3"
gem "rake", "10.1.1"
gem "rspec-puppet", "1.0.1"
gem "deep_merge", "~> 1.0"
group :development do
gem "aws-sdk", "~> 1.37"

2
Gemfile.lock
View file

@ -16,6 +16,7 @@ GEM
octokit (~> 2.3.0)
puppet (~> 3.0)
builder (3.2.2)
deep_merge (1.0.1)
diff-lcs (1.2.5)
facter (1.7.5)
faraday (0.9.0)
@ -84,6 +85,7 @@ PLATFORMS
DEPENDENCIES
aws-sdk (~> 1.37)
boxen (~> 2.3.0)
deep_merge (~> 1.0)
hiera (~> 1.3.2)
librarian-puppet (~> 0.9.14)
net-ssh

BIN
vendor/cache/deep_merge-1.0.1.gem vendored Normal file
View file

Binary file not shown.