From b4be5cd561cab83cabf33a689602fff3104a1abf Mon Sep 17 00:00:00 2001
From: Kelvin Jasperson <github@mqp3.com>
Date: Mon, 2 Mar 2015 15:01:28 -0700
Subject: [PATCH 1/4] Update Vagrantfile to autoprovision

---
 .gitignore  | 1 +
 README.rst  | 2 --
 Vagrantfile | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7834ce..6442824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.project
 *.swp
+.vagrant
diff --git a/README.rst b/README.rst
index bb05bf7..f01b868 100644
--- a/README.rst
+++ b/README.rst
@@ -385,8 +385,6 @@ Ubuntu box. First, install Vagrant, then::
 
     $ vagrant up
     $ vagrant ssh
-    <vm> $ cd /salt_bootstrap
-    <vm> $ sudo sh salt-bootstrap.sh
 
 
 .. _Vagrant: http://www.vagrantup.com
diff --git a/Vagrantfile b/Vagrantfile
index 94166f9..64c2213 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,7 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise64"
+  config.vm.box = "ubuntu/precise64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -40,6 +40,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # argument is a set of non-required options.
   config.vm.synced_folder ".", "/salt_bootstrap"
 
+  config.vm.provision "shell", path: "bootstrap-salt.sh"
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:

From 5601d6ce6be2f62baed1c4088764b2b6747eb6f0 Mon Sep 17 00:00:00 2001
From: Fred Reimer <Fred.Reimer@jmfamily.com>
Date: Tue, 10 Mar 2015 22:28:20 -0400
Subject: [PATCH 2/4] Add Multi-Master-PKI Capability for Minions

---
 bootstrap-salt.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d1fb855..db18ed1 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4510,6 +4510,12 @@ config_salt() {
             chmod 664 "$_PKI_DIR/minion/minion.pub" || return 1
             CONFIGURED_ANYTHING=$BS_TRUE
         fi
+        # For multi-master-pki, copy the master_sign public key if found
+        if [ -f "$_TEMP_CONFIG_DIR/master_sign.pub" ]; then
+            movefile "$_TEMP_CONFIG_DIR/master_sign.pub" "$_PKI_DIR/minion/" || return 1
+            chmod 664 "$_PKI_DIR/minion/master_sign.pub" || return 1
+            CONFIGURED_ANYTHING=$BS_TRUE
+        fi
     fi
 
 

From 5c653c872bbc1117517b7e56e215237d315f41e5 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 11 Mar 2015 15:46:13 +0000
Subject: [PATCH 3/4] Update changes log

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 10bf83b..cd8a8ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2015.xx.xx:
+	* Add multi-master support. Thanks Fred Reimer(freimer). #555
+
 Version 2015.03.04:
 	* Fix the salt package selection on Arch stable installs.
 

From 004e25b1a7017620b4ebd4abf07d85ad9f692827 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 11 Mar 2015 19:00:22 +0000
Subject: [PATCH 4/4] Bump version for stable release.

---
 ChangeLog         | 2 +-
 bootstrap-salt.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd8a8ad..d2a641d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2015.xx.xx:
+Version 2015.03.15:
 	* Add multi-master support. Thanks Fred Reimer(freimer). #555
 
 Version 2015.03.04:
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index db18ed1..3abbc84 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -17,7 +17,7 @@
 #       CREATED: 10/15/2012 09:49:37 PM WEST
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
-__ScriptVersion="2015.03.04"
+__ScriptVersion="2015.03.15"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================