aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2014-04-04 13:48:09 +0000
committerPascal Terjan <pterjan@mageia.org>2014-04-04 13:48:09 +0000
commit56399cc179ae5f58f621f9f467cc8e4ed608e64f (patch)
tree688fcb4164dee28aab662a87348fcaa40ff4962a /deployment
parent7592a564535539f79cf1bfce95d8450e6d0a4cca (diff)
downloadpuppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar
puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.gz
puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.bz2
puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.xz
puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.zip
Don't use merge, it's not a standard function
Diffstat (limited to 'deployment')
0 files changed, 0 insertions, 0 deletions