Skip to content
This repository has been archived by the owner on Jan 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #497 from ripienaar/496
Browse files Browse the repository at this point in the history
(#496) dependency updates
  • Loading branch information
ripienaar authored May 16, 2018
2 parents 717ba61 + 7a059ec commit 3b46564
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem "nats-pure", "~> 0.4"

group :development, :test do
gem "coveralls"
gem "diplomat", "~> 1"
gem "diplomat", "~> 2"
gem "etcdv3", "~> 0.6.0"
gem "guard-rspec"
gem "guard-shell"
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
diplomat (1.3.0)
diplomat (2.0.2)
faraday (~> 0.9)
json
docile (1.1.5)
Expand Down Expand Up @@ -57,7 +57,7 @@ GEM
guard (>= 2.0.0)
guard-compat (~> 1.0)
hashdiff (0.3.7)
hiera (3.4.2)
hiera (3.4.3)
jgrep (1.5.0)
json (2.1.0)
json-schema (2.8.0)
Expand All @@ -76,32 +76,32 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
lumberjack (1.0.13)
mcollective-client (2.12.0)
mcollective-client (2.12.1)
json
stomp
systemu
memoist (0.16.0)
metaclass (0.0.4)
method_source (0.9.0)
mocha (1.4.0)
mocha (1.5.0)
metaclass (~> 0.0.1)
multi_json (1.13.1)
multipart-post (2.0.0)
nats-pure (0.4.0)
nats-pure (0.5.0)
nenv (0.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
os (0.9.6)
parallel (1.12.1)
parser (2.5.0.5)
parser (2.5.1.0)
ast (~> 2.4.0)
powerpack (0.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.2)
puppet (5.5.0)
puppet (5.5.1)
facter (> 2.0.1, < 4)
fast_gettext (~> 1.1.2)
hiera (>= 3.2.1, < 4)
Expand Down Expand Up @@ -154,8 +154,8 @@ GEM
tins (~> 1.0)
thor (0.19.4)
tins (1.16.3)
unicode-display_width (1.3.0)
webmock (3.3.0)
unicode-display_width (1.3.2)
webmock (3.4.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand All @@ -166,7 +166,7 @@ PLATFORMS

DEPENDENCIES
coveralls
diplomat (~> 1)
diplomat (~> 2)
etcdv3 (~> 0.6.0)
guard-rspec
guard-shell
Expand Down
2 changes: 1 addition & 1 deletion module/choria/data/plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
mcollective_choria::config_name: choria
mcollective_choria::gem_dependencies:
"nats-pure": "0.4.0"
"nats-pure": "0.5.0"

mcollective_choria::client_directories:
- util/playbook
Expand Down
11 changes: 0 additions & 11 deletions module/choria/files/federation_broker.service

This file was deleted.

0 comments on commit 3b46564

Please sign in to comment.