diff options
author | elijah <elijah@riseup.net> | 2014-06-26 02:23:13 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-06-26 02:23:13 -0700 |
commit | 31d50d27d9f83552362b3b6ea3ffedd2c520271b (patch) | |
tree | 3c80521475a87295995e1fad067dc9ff94a892c6 /provider_base/lib/macros/core.rb | |
parent | 8d5c14b26b6f95285d9ed2b17c61d18d5de005e6 (diff) | |
parent | c463cb45bafeb308aa778844f3a0a7eadb467597 (diff) |
Merge branch 'feature/couch' of github.com:elijh/leap_platform into feature/couch
Conflicts:
puppet/modules/site_couchdb/manifests/init.pp
puppet/modules/site_couchdb/manifests/mirror.pp
puppet/modules/site_shorewall/manifests/stunnel/server.pp
Diffstat (limited to 'provider_base/lib/macros/core.rb')
0 files changed, 0 insertions, 0 deletions