Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump puppet from 3.8.5 to 6.13.0 #30

Closed
wants to merge 1 commit into from
Closed

Bump puppet from 3.8.5 to 6.13.0 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'syslogger', git: 'https://github.com/jbussdieker/syslogger.git', :branch =>
gem 'rails', '4.2.8'
gem 'rake', '< 11.0'
gem 'mysql2', '0.3.18'
gem 'puppet', '3.8.5' # NOTE: this should match what we are using in production
gem 'puppet', '6.13.0' # NOTE: this should match what we are using in production
gem 'safe_yaml', '~> 1.0.4'
gem 'mcollective-client'
gem 'chartkick'
Expand Down
31 changes: 22 additions & 9 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,36 @@ GEM
crass (1.0.3)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
deep_merge (1.2.1)
diff-lcs (1.3)
docile (1.1.5)
erubis (2.7.0)
execjs (2.7.0)
facter (2.5.1)
facter (2.5.7)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faker (1.8.7)
i18n (>= 0.7)
fast_gettext (1.8.0)
ffi (1.9.23)
globalid (0.4.1)
activesupport (>= 4.2.0)
groupdate (3.2.0)
activesupport (>= 3)
hiera (1.3.4)
json_pure
hiera (3.7.0)
hike (1.2.3)
hocon (1.3.1)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.1.0)
json_pure (2.1.0)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
Expand All @@ -117,6 +119,7 @@ GEM
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.11.0)
locale (2.1.3)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -137,10 +140,19 @@ GEM
protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (3.0.2)
puppet (3.8.5)
facter (> 1.6, < 3)
hiera (~> 1.0)
json_pure
puppet (6.13.0)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (> 2.0.1, < 5)
fast_gettext (~> 1.1)
hiera (>= 3.2.1, < 4)
httpclient (~> 2.8)
locale (~> 2.1)
multi_json (~> 1.10)
puppet-resource_api (~> 1.5)
semantic_puppet (~> 1.0)
puppet-resource_api (1.8.13)
hocon (>= 1.0)
rack (1.6.9)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -206,6 +218,7 @@ GEM
selenium-webdriver (3.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
semantic_puppet (1.0.3)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -262,7 +275,7 @@ DEPENDENCIES
mysql2 (= 0.3.18)
newrelic_rpm
protected_attributes
puppet (= 3.8.5)
puppet (= 6.13.0)
rails (= 4.2.8)
rails-bootstrap (~> 3.0.0)
rake (< 11.0)
Expand Down