]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.