Skip to content

Commit f189a70

Browse files
authored
Merge pull request #18 from github/update-puppet
Update puppet to 6.25.1
2 parents 5ad6cf2 + bfedf70 commit f189a70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+24
-20
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ group :development do
1414
gem "simplecov-json", "~> 0.2"
1515

1616
# Integration test
17-
gem "puppet", ">= #{ENV['PUPPET_VERSION'] || '4.10.4'}"
17+
gem "puppet", "~> #{ENV['PUPPET_VERSION'] || '6.25.1'}"
1818
gem "rspec-puppet", "~> #{ENV['RSPEC_PUPPET_VERSION'] || '2.6.2'}"
1919
end

Gemfile.lock

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,35 @@ GEM
2323
base64 (0.2.0)
2424
coderay (1.1.3)
2525
concurrent-ruby (1.2.2)
26+
deep_merge (1.2.2)
2627
diff-lcs (1.5.0)
2728
diffy (3.4.2)
2829
docile (1.1.5)
29-
facter (2.5.7)
30-
multipart-post (>= 1.2, < 3)
30+
facter (4.5.2)
31+
hocon (~> 1.3)
32+
thor (>= 1.0.1, < 2.0)
3133
faraday (2.7.12)
3234
base64
3335
faraday-net_http (>= 2.0, < 3.1)
3436
ruby2_keywords (>= 0.0.4)
3537
faraday-net_http (3.0.2)
36-
fast_gettext (1.1.2)
37-
gettext (3.2.9)
38-
locale (>= 2.0.5)
39-
text (>= 1.3.0)
40-
gettext-setup (0.34)
41-
fast_gettext (~> 1.1.0)
42-
gettext (>= 3.0.2, < 3.3.0)
43-
locale
38+
fast_gettext (1.8.0)
4439
hashdiff (1.0.1)
4540
hiera (3.12.0)
41+
hocon (1.4.0)
4642
httparty (0.21.0)
4743
mini_mime (>= 1.0.0)
4844
multi_xml (>= 0.5.2)
45+
httpclient (2.8.3)
4946
i18n (1.14.1)
5047
concurrent-ruby (~> 1.0)
5148
json (2.6.1)
52-
json_pure (1.8.6)
5349
locale (2.1.3)
5450
method_source (1.0.0)
5551
mini_mime (1.1.5)
5652
minitest (5.20.0)
53+
multi_json (1.15.0)
5754
multi_xml (0.6.0)
58-
multipart-post (2.1.1)
5955
net-ssh (7.2.0)
6056
octocatalog-diff (2.1.0)
6157
diffy (>= 3.1.0)
@@ -74,12 +70,19 @@ GEM
7470
coderay (~> 1.1)
7571
method_source (~> 1.0)
7672
public_suffix (5.0.4)
77-
puppet (4.10.12)
78-
facter (> 2.0, < 4)
79-
gettext-setup (>= 0.10, < 1)
80-
hiera (>= 2.0, < 4)
81-
json_pure (~> 1.8)
73+
puppet (6.25.1)
74+
concurrent-ruby (~> 1.0)
75+
deep_merge (~> 1.0)
76+
facter (> 2.0.1, < 5)
77+
fast_gettext (~> 1.1)
78+
hiera (>= 3.2.1, < 4)
79+
httpclient (~> 2.8)
8280
locale (~> 2.1)
81+
multi_json (~> 1.10)
82+
puppet-resource_api (~> 1.5)
83+
semantic_puppet (~> 1.0)
84+
puppet-resource_api (1.9.0)
85+
hocon (>= 1.0)
8386
racc (1.7.3)
8487
rack (3.0.8)
8588
rainbow (3.1.1)
@@ -130,6 +133,7 @@ GEM
130133
sawyer (0.9.2)
131134
addressable (>= 2.3.5)
132135
faraday (>= 0.17.3, < 3)
136+
semantic_puppet (1.0.4)
133137
simplecov (0.14.1)
134138
docile (~> 1.1.0)
135139
json (>= 1.8, < 3)
@@ -138,7 +142,7 @@ GEM
138142
simplecov-json (0.2.3)
139143
json
140144
simplecov
141-
text (1.3.1)
145+
thor (1.3.0)
142146
tzinfo (2.0.6)
143147
concurrent-ruby (~> 1.0)
144148
unicode-display_width (2.5.0)
@@ -152,7 +156,7 @@ DEPENDENCIES
152156
octofacts-updater!
153157
parallel (= 1.12.0)
154158
pry (~> 0.14)
155-
puppet (~> 4.10.4)
159+
puppet (~> 6.25.1)
156160
rake (~> 12.3)
157161
rspec-puppet (~> 2.6.2)
158162
rubocop-github (~> 0.20.0)

vendor/cache/ast-2.3.0.gem

-14.5 KB
Binary file not shown.

vendor/cache/coderay-1.1.1.gem

-94 KB
Binary file not shown.

vendor/cache/coderay-1.1.3.gem

90.5 KB
Binary file not shown.

vendor/cache/deep_merge-1.2.2.gem

14.5 KB
Binary file not shown.

vendor/cache/diff-lcs-1.3.gem

-45 KB
Binary file not shown.

vendor/cache/diff-lcs-1.5.0.gem

51.5 KB
Binary file not shown.

vendor/cache/facter-2.5.7.gem

-242 KB
Binary file not shown.

vendor/cache/facter-4.5.2.gem

162 KB
Binary file not shown.

0 commit comments

Comments
 (0)