saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index ef801b4275baefca200ae14605a268ab77c47a46..0fbbaff85a341c9e1102b0f5fa4483b5deaf7834 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -880,6 +880,7 @@ maybe chmod 0644 'salt/pki/master/minions/storage11.stage.pb.local'
 maybe chmod 0644 'salt/pki/master/minions/storage1501.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage1601.dc2.us.profitbricks.net'
 maybe chmod 0644 'salt/pki/master/minions/storage1604.dc2.us.profitbricks.net'
+maybe chmod 0644 'salt/pki/master/minions/storage7.stage.pb.local.pub'
 maybe chmod 0755 'salt/pki/master/minions_autosign'
 maybe chmod 0755 'salt/pki/master/minions_denied'
 maybe chmod 0770 'salt/pki/master/minions_pre'

diff --git a/salt/master b/salt/master
index a44283527c6c4015b66e7883c2784778018a50cf..fa1d119697df91cd45c0371134af7bf4e8570f1d 100644 (file)
--- a/salt/master
+++ b/salt/master
@@ -429,6 +429,7 @@ file_roots:
 # being merged together and instead to only use the top file from the
 # requested environment, set this value to 'same'. 
 #top_file_merging_strategy: merge
+top_file_merging_strategy: same
 
 # To specify the order in which environments are merged, set the ordering
 # in the env_order option. Given a conflict, the last matching value will

diff --git a/salt/pki/master/minions/storage7.stage.pb.local.pub b/salt/pki/master/minions/storage7.stage.pb.local.pub
new file mode 100644 (file)
index 0000000..2cdcfba
--- /dev/null
+++ b/salt/pki/master/minions/storage7.stage.pb.local.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx6GO7h7W9/icfVjc5+eu
+e+oXnXGSpa657/iOVd81rpkZKj809wS00CdiJSgzLB3NZ2jbTVV9m+T+rE4EFyLe
+p/KwNt2tPhJDBcCiAbkom9IDLanM3DTyOAY71gumypL2AOvdSR6kC6mQAyNH1bL+
+DO7O6QY0a0zdBW5WGAcIzkuBlkfzwMQNIe0Mv+HQ+6iFfreRz0FyPfiOIoKIncte
+xCACQjgWaRRwEtibbmJgasd/Yg6YinHB6/CW2K1FPvmLfS0FtNglGrYLnMf+GDd/
+aUFmVpLh0RnyDRGD692SIPg1XvPErUXXMNA97HAD3GL+co+QmWhYarwtcFU06mxC
+Nn+0BjisoVrlk3MFBNOoF8t98tuzuE0tDKzmm2eNyPbRXCkHIfGIUO2PItc73o2P
+PS4oTs09foBAv1LkuL/gPNYJSEIJRlDe5h7HPiyOFJ7BVH7ZuMKBUToq6J+gSgka
+N5qeqc8484AAb7CzT6/5DI97Ryj5JcwA+uuP7kFAB7Q6kI/pbT+uzhUi+FtGT9EQ
+DcpjhTG3RyLypolOT9ap8oFAuLeb1VBWJ38hJwzpGug6Fmc+dGiE7W4BaO6jauzo
+X7q7nH8ALGRn4mG7ubPNnul7jum0AK2ZW7D+CZANLihm9Qdb0/+KcoL0JXBkaKdi
+xHPSwZsbrooHv6Vg7f/fOykCAwEAAQ==
+-----END PUBLIC KEY-----