]> Frank Brehm's Git Trees - salt/pillar.git/commitdiff
projects / salt / pillar.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4b78da ef8806d)
Merge branch 'master' of ssh://git.brehm-online.com/var/lib/git/salt/pillar
authorFrank Brehm <frank@brehm-online.com>
Fri, 18 Mar 2016 10:15:35 +0000 (11:15 +0100)
committerFrank Brehm <frank@brehm-online.com>
Fri, 18 Mar 2016 10:15:35 +0000 (11:15 +0100)
1  2 
bind/common.sls patch | diff1 | diff2 | blob | history

diff --cc bind/common.sls
Simple merge
Unnamed repository; edit this file 'description' to name the repository.