Skip to content

Commit be327ab

Browse files
author
Anthony Riley II
authored
Merge branch 'master' into dependabot/bundler/addressable-2.8.0
2 parents a0074e9 + 21f918a commit be327ab

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gemspec name: "octofacts-updater"
66
group :development do
77
gem "parallel", "= 1.12.0"
88
gem "pry", "~> 0.10"
9-
gem "rake", "~> 10.0"
9+
gem "rake", "~> 12.3"
1010
gem "rubocop-github", "~> 0.5.0"
1111
gem "simplecov", ">= 0.14.1"
1212
gem "simplecov-json", "~> 0.2"

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ GEM
1616
ast (2.3.0)
1717
coderay (1.1.1)
1818
diff-lcs (1.3)
19-
diffy (3.2.0)
19+
diffy (3.4.2)
2020
docile (1.1.5)
21-
facter (2.4.6)
2221
faraday (0.17.4)
22+
facter (2.5.7)
2323
multipart-post (>= 1.2, < 3)
24-
fast_gettext (1.1.0)
25-
gettext (3.2.3)
24+
fast_gettext (1.1.2)
25+
gettext (3.2.9)
2626
locale (>= 2.0.5)
2727
text (>= 1.3.0)
28-
gettext-setup (0.25)
28+
gettext-setup (0.34)
2929
fast_gettext (~> 1.1.0)
30-
gettext (>= 3.0.2)
30+
gettext (>= 3.0.2, < 3.3.0)
3131
locale
3232
hashdiff (0.3.6)
33-
hiera (3.3.1)
33+
hiera (3.12.0)
3434
httparty (0.15.6)
3535
multi_xml (>= 0.5.2)
36-
json (2.1.0)
36+
json (2.5.1)
3737
json_pure (1.8.6)
38-
locale (2.1.2)
38+
locale (2.1.3)
3939
method_source (0.8.2)
4040
multi_xml (0.6.0)
4141
multipart-post (2.1.1)
@@ -57,15 +57,15 @@ GEM
5757
method_source (~> 0.8.1)
5858
slop (~> 3.4)
5959
public_suffix (3.1.1)
60-
puppet (4.10.4)
60+
puppet (4.10.12)
6161
facter (> 2.0, < 4)
6262
gettext-setup (>= 0.10, < 1)
6363
hiera (>= 2.0, < 4)
6464
json_pure (~> 1.8)
6565
locale (~> 2.1)
6666
rainbow (2.2.2)
6767
rake
68-
rake (10.5.0)
68+
rake (12.3.3)
6969
rspec (3.6.0)
7070
rspec-core (~> 3.6.0)
7171
rspec-expectations (~> 3.6.0)
@@ -116,7 +116,7 @@ DEPENDENCIES
116116
parallel (= 1.12.0)
117117
pry (~> 0.10)
118118
puppet (~> 4.10.4)
119-
rake (~> 10.0)
119+
rake (~> 12.3)
120120
rspec-puppet (~> 2.6.2)
121121
rubocop-github (~> 0.5.0)
122122
simplecov (>= 0.14.1)

0 commit comments

Comments
 (0)