projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02dcf7e e200005)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 16 May 2015 07:26:49 +0000 (07:26 +0000)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 16 May 2015 07:26:49 +0000 (07:26 +0000)
commit82f52659d81b3a65130a7133b2e78f88496b58f1
tree0ccbfe6cc0aaec358f999cb0c969a91a375409c8tree | snapshot
parent02dcf7e82c77342e4158749d1ce2c6836dd143b5commit | diff
parente200005317ddfcfbd8306fdef71a1e9240d0b123commit | diff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  replace a few dijkstra occurrences with ubc-bl8

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
Conflicts:
modules/lvm/manifests/init.pp
Unnamed repository; edit this file 'description' to name the repository.