summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-30 15:16:50 +0100
committervarac <varacanero@zeromail.org>2012-10-30 15:16:50 +0100
commit641d9f15ad12c3f580cf27c3fe4ee6dd16462f22 (patch)
tree567232c68f011345be1e61566f93bcb401bd8f3f /puppet/manifests
parentf066f7a99a8d15f5b80c5bbf9117606c723ab352 (diff)
parentb4a32c98e5bd2184f6fc5fef1300e35ab36dbb99 (diff)
Merge branch 'develop' into feature/couchdb
Diffstat (limited to 'puppet/manifests')
0 files changed, 0 insertions, 0 deletions