From 62eea1878af00d1347cd4639d1f1809189bd6b89 Mon Sep 17 00:00:00 2001
From: Alexander Krasnukhin <the.malkolm@gmail.com>
Date: Tue, 28 Jun 2016 01:36:56 +0200
Subject: [PATCH 01/16] Add tests for ps1

---
 appveyor.yml       |  32 ++++++++++++++
 tests/runtests.ps1 | 105 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 appveyor.yml
 create mode 100644 tests/runtests.ps1

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..6c7b57b0d
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,32 @@
+platform: Any CPU
+
+environment:
+  matrix:
+    - bootstrap_args:
+      test_args:      -master salt -runservice
+
+    - bootstrap_args: -runservice false
+      test_args:      -master salt -noservice
+
+    - bootstrap_args: -minion a-minion
+      test_args:      -minion a-minion -master salt -runservice
+
+    - bootstrap_args: -minion a-minion -master a-master
+      test_args:      -minion a-minion -master a-master -runservice
+
+build_script:
+  - ps: |
+      $Path = (Get-Location).Path | Join-Path -ChildPath bootstrap-salt.ps1
+      Invoke-Expression "$Path -verbose $env:bootstrap_args"
+
+before_test:
+  - SET PATH=%PATH%;C:\salt
+  - salt-call --version
+
+test_script:
+  - ps: |
+      $Path = (Get-Location).Path | Join-Path -ChildPath tests\runtests.ps1
+      Invoke-Expression "$Path -verbose $env:test_args"
+
+matrix:
+  fast_finish: true
diff --git a/tests/runtests.ps1 b/tests/runtests.ps1
new file mode 100644
index 000000000..3d83b85be
--- /dev/null
+++ b/tests/runtests.ps1
@@ -0,0 +1,105 @@
+<#
+.SYNOPSIS
+    A simple Powershell script to test installed salt minion on windows.
+
+.PARAMETER version
+    Salt version installed.
+
+.PARAMETER runservice
+    Boolean flag whenever to test if service is running.
+
+.PARAMETER noservice
+    Boolean flag whenever to test if service is not running.
+
+.PARAMETER minion
+    Name of the minion installed on this host.
+
+.PARAMETER master
+    Name of the master configured on this host.
+
+.EXAMPLE
+    ./runtests.ps1
+    Runs without any parameters. Uses all the default values/settings.
+#>
+
+#===============================================================================
+# Commandlet Binding
+#===============================================================================
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$False,ValueFromPipeline=$True)]
+    [string]$version = $null,
+
+    [Parameter(Mandatory=$False,ValueFromPipeline=$True)]
+    [switch]$runservice,
+
+    [Parameter(Mandatory=$False,ValueFromPipeline=$True)]
+    [switch]$noservice,
+
+    [Parameter(Mandatory=$False,ValueFromPipeline=$True)]
+    [string]$minion = $null,
+
+    [Parameter(Mandatory=$False,ValueFromPipeline=$True)]
+    [string]$master = $null
+)
+
+#===============================================================================
+# Script Functions
+#===============================================================================
+function Get-Grains ([string]$Name) {
+    $Command = "salt-call --local --out json --out-indent -1 grains.get $Name"
+    $Result = iex $Command | Out-String | ConvertFrom-Json
+
+    Write-Verbose "salt-call grains.get ${Name}:`n${Result}"
+    return $Result."local"
+}
+
+function Get-Service-Status([string]$Name) {
+    $Service = Get-Service $Name -ErrorAction Stop
+    $Status = $Service.Status
+
+    Write-Verbose "${Name}: ${Status}"
+    return $Status
+}
+
+function Assert-Equal {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
+        [string]$Actual,
+
+        [Parameter(Mandatory=$True,ValueFromPipeline=$True)]
+        [string]$Expected
+    )
+
+    If ($Actual -ne $Expected) {
+        throw "Assert: $Actual != $Expected"
+    }
+}
+
+#===============================================================================
+# Do enabled checks
+#===============================================================================
+if ($True) {
+    Get-Grains -Name os_family | Assert-Equal -Expected "Windows"
+}
+
+if ($version) {
+    Get-Grains -Name saltversion | Assert-Equal -Expected $version
+}
+
+if ($master) {
+    Get-Grains -Name master | Assert-Equal -Expected $master
+}
+
+if ($minion) {
+    Get-Grains -Name id | Assert-Equal -Expected $minion
+}
+
+if ($runservice) {
+    Get-Service-Status salt-minion | Assert-Equal -Expected "Running"
+}
+
+if ($noservice) {
+    Get-Service-Status salt-minion | Assert-Equal -Expected "Stopped"
+}

From a268be85cace8b9207c8b200b74f48fa845eae08 Mon Sep 17 00:00:00 2001
From: Alexander Krasnukhin <the.malkolm@gmail.com>
Date: Tue, 28 Jun 2016 13:16:51 +0200
Subject: [PATCH 02/16] Update README.rst

---
 README.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.rst b/README.rst
index 9c597a1f3..cdda71291 100644
--- a/README.rst
+++ b/README.rst
@@ -2,6 +2,8 @@
 Bootstrapping Salt
 ==================
 
+|windows_build|
+
 Before `Salt`_ can be used for provisioning on the desired machine, the binaries need to be
 installed. Since `Salt`_ supports many different distributions and versions of operating systems,
 the `Salt`_ installation process is handled by this shell script ``bootstrap-salt.sh``.  This
@@ -535,3 +537,7 @@ Salt is ready and working in the Docker container with Minion authenticated on M
 
 
 .. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et
+
+.. |windows_build|  image:: https://ci.appveyor.com/api/projects/status/github/themalkolm/salt-bootstrap?branch=develop&svg=true
+    :target: https://ci.appveyor.com/project/themalkolm/salt-bootstrap
+    :alt: Build status of the develop branch on Windows

From 0d8cd5edbf0a1ecec60ba1ef3c31aa6b7678e9d6 Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Wed, 29 Jun 2016 11:23:58 +0300
Subject: [PATCH 03/16] Fix expanding shell script position parameters with
 nounset enabled

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 60e1fc03d..277094505 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -21,8 +21,8 @@ set -o nounset                              # Treat unset variables as an error
 __ScriptVersion="2016.06.27"
 __ScriptName="bootstrap-salt.sh"
 
-__ScriptFullName="${0}"
-__ScriptArgs="${*}"
+__ScriptFullName="$0"
+__ScriptArgs="$*"
 
 #======================================================================================================================
 #  Environment variables taken into account.
@@ -630,7 +630,7 @@ fi
 
 echoinfo "Running version: ${__ScriptVersion}"
 echoinfo "Executed by: ${CALLER}"
-echoinfo "Command line: \"${__ScriptFullName} ${__ScriptArgs}\""
+echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
 echowarn "Running the unstable version of ${__ScriptName}"
 
 #---  FUNCTION  -------------------------------------------------------------------------------------------------------

From 403847d138bf9c4da6b48a58a28221c529f4dc74 Mon Sep 17 00:00:00 2001
From: Petr Michalec <epcim@apealive.net>
Date: Wed, 29 Jun 2016 13:29:07 +0200
Subject: [PATCH 04/16] add apt-transport-https for ubuntu

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d2b70c056..3f65440f9 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2341,6 +2341,11 @@ install_ubuntu_stable_deps() {
                 set -o nounset
             fi
 
+            # Make sure https transport is available
+            if [ "$HTTP_VAL" = "https" ] ; then
+                __apt_get_install_noinput ca-certificates apt-transport-https || return 1
+            fi
+
             # Make sure wget is available
             __apt_get_install_noinput wget
 

From a124f33631a4c77fad072c2a6eba233cdf4f1a1c Mon Sep 17 00:00:00 2001
From: Alexander Krasnukhin <the.malkolm@gmail.com>
Date: Tue, 24 May 2016 20:46:27 +0200
Subject: [PATCH 05/16] Keep original name of salt executable executable

It is a good idea to not rename anything and keep the original name.
Renaming to salt.exe we loose version and arch information.
---
 bootstrap-salt.ps1 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 2bff69e39..984eebed4 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -217,10 +217,11 @@ If (!$version) {
 #===============================================================================
 # Download minion setup file
 #===============================================================================
-Write-Output "Downloading Salt minion installer Salt-Minion-$version-$arch-Setup.exe"
+$saltExe = "Salt-Minion-$version-$arch-Setup.exe"
+Write-Output "Downloading Salt minion installer $saltExe"
 $webclient = New-Object System.Net.WebClient
-$url = "$repourl/Salt-Minion-$version-$arch-Setup.exe"
-$file = "C:\tmp\salt.exe"
+$url = "$repourl/$saltExe"
+$file = "C:\tmp\$saltExe"
 $webclient.DownloadFile($url, $file)
 
 #===============================================================================
@@ -240,7 +241,7 @@ If($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
 #===============================================================================
 #Wait for process to exit before continuing.
 Write-Output "Installing Salt minion"
-Start-Process C:\tmp\salt.exe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
+Start-Process C:\tmp\$saltExe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
 
 #===============================================================================
 # Configure the minion service

From 8c0bec48836d27dc75fdd4e3f5ef5e32ad347e94 Mon Sep 17 00:00:00 2001
From: Alexander Krasnukhin <the.malkolm@gmail.com>
Date: Thu, 30 Jun 2016 16:57:19 +0200
Subject: [PATCH 06/16] Change temporary directory for exectutable to
 C:\Windows\Temp

Yep, $env:temp is even better but lets change things step by
step.

This makes script inconsistent as other parts still use c:\tmp
for storing configuraiton files. I don't want to change them
as it is *very* likely users upload configuraiton files there
already using external scripts.
---
 bootstrap-salt.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index 984eebed4..2f51d23e5 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -221,7 +221,7 @@ $saltExe = "Salt-Minion-$version-$arch-Setup.exe"
 Write-Output "Downloading Salt minion installer $saltExe"
 $webclient = New-Object System.Net.WebClient
 $url = "$repourl/$saltExe"
-$file = "C:\tmp\$saltExe"
+$file = "C:\Windows\Temp\$saltExe"
 $webclient.DownloadFile($url, $file)
 
 #===============================================================================
@@ -241,7 +241,7 @@ If($runservice -eq $false) {$parameters = "$parameters /start-service=0"}
 #===============================================================================
 #Wait for process to exit before continuing.
 Write-Output "Installing Salt minion"
-Start-Process C:\tmp\$saltExe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
+Start-Process C:\Windows\Temp\$saltExe -ArgumentList "/S $parameters" -Wait -NoNewWindow -PassThru | Out-Null
 
 #===============================================================================
 # Configure the minion service

From 85ae1d4f554f69285f07ca57a58b6643297e28a7 Mon Sep 17 00:00:00 2001
From: Matthew Richardson <M.Richardson@ed.ac.uk>
Date: Mon, 4 Jul 2016 17:23:02 +0100
Subject: [PATCH 07/16] Set repo_arch for raspberry pi installs.

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 277094505..c246f9138 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2714,6 +2714,8 @@ install_debian_7_deps() {
     if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
         if [ "$CPU_ARCH_L" = "amd64" ] || [ "$CPU_ARCH_L" = "x86_64" ]; then
             repo_arch="amd64"
+        elif [ "$CPU_ARCH_L" = "armv7l" ]; then
+            repo_arch="armhf"
         elif [ "$CPU_ARCH_L" = "i386" ] || [ "$CPU_ARCH_L" = "i686" ]; then
             echoerror "repo.saltstack.com likely doesn't have 32-bit packages for Debian (yet?)"
             repo_arch="i386"
@@ -2790,6 +2792,8 @@ install_debian_8_deps() {
     if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
         if [ "$CPU_ARCH_L" = "amd64" ] || [ "$CPU_ARCH_L" = "x86_64" ]; then
             repo_arch="amd64"
+        elif [ "$CPU_ARCH_L" = "armv7l" ]; then
+            repo_arch="armhf"
         elif [ "$CPU_ARCH_L" = "i386" ] || [ "$CPU_ARCH_L" = "i686" ]; then
             echoerror "repo.saltstack.com likely doesn't have 32-bit packages for Debian (yet?)"
             repo_arch="i386"

From f2cde6828686b2d15ca378b210afb61c9a68efa4 Mon Sep 17 00:00:00 2001
From: Eliezer Paiewonsky <eliezerlp@qspark.co>
Date: Tue, 5 Jul 2016 13:41:23 -0400
Subject: [PATCH 08/16] Adding support for Linux Mint 18 (based on Ubuntu
 16.04)

---
 README.rst        | 2 +-
 bootstrap-salt.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 9c597a1f3..cbd869828 100644
--- a/README.rst
+++ b/README.rst
@@ -236,7 +236,7 @@ Ubuntu and derivatives
 
 - Elementary OS 0.2 (based on Ubuntu 12.04)
 - Linaro 12.04
-- Linux Mint 13/14/16/17
+- Linux Mint 13/14/16/17/18
 - Trisquel GNU/Linux 6 (based on Ubuntu 12.04)
 - Ubuntu 10.x/11.x/12.x/13.x/14.x/15.x/16.04
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 277094505..0a22e685a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1180,6 +1180,7 @@ __ubuntu_derivatives_translation() {
 
     linuxmint_16_ubuntu_base="13.10"
     linuxmint_17_ubuntu_base="14.04"
+    linuxmint_18_ubuntu_base="16.04"
     linaro_12_ubuntu_base="12.04"
     elementary_os_02_ubuntu_base="12.04"
 

From b2347b5e34bf11445481e2b53814858ea322b896 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 5 Jul 2016 12:33:05 -0600
Subject: [PATCH 09/16] Allow git installation for SLES 12

Fixes #846

Uses the 'install_suse_12_stable_deps' function instead of 'install_suse_11_stable_deps' call
and also checks for the '/usr/lib/systemd/' directory in the 'install_opensuse_git_post'
function when running SUSE 12 git installations.
---
 bootstrap-salt.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 277094505..a4e45c2e4 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -5204,7 +5204,16 @@ install_opensuse_git_post() {
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
         if [ -f /bin/systemctl ]; then
+            use_usr_lib=$BS_FALSE
             if [ "${DISTRO_MAJOR_VERSION}" -gt 13 ] || ([ "${DISTRO_MAJOR_VERSION}" -eq 13 ] && [ "${DISTRO_MINOR_VERSION}" -ge 2 ]); then
+                use_usr_lib=$BS_TRUE
+            fi
+
+            if [ "${DISTRO_MAJOR_VERSION}" -eq 12 ] && [ -d "/usr/lib/systemd/" ]; then
+                use_usr_lib=$BS_TRUE
+            fi
+
+            if [ "${use_usr_lib}" -eq $BS_TRUE ]; then
                 __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/usr/lib/systemd/system/salt-${fname}.service"
             else
                 __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
@@ -5371,7 +5380,7 @@ install_suse_12_stable_deps() {
 }
 
 install_suse_12_git_deps() {
-    install_suse_11_stable_deps || return 1
+    install_suse_12_stable_deps || return 1
 
     if ! __check_command_exists git; then
         __zypper_install git  || return 1

From 585436eb06ca35aa556ce3e924c3ee812843759e Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 5 Jul 2016 13:47:29 -0600
Subject: [PATCH 10/16] Remove tests written question from template

There is not currently an easy or documented way to add tests
to the bootstrap script. Removing this now so as not to confuse users.
We can add it back later when this is built out.
---
 .github/PULL_REQUEST_TEMPLATE.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4d38780d6..1cfce68a1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,6 +8,3 @@ Remove this section if not relevant
 ### New Behavior
 Remove this section if not relevant
 
-### Tests written?
-
-Yes/No

From 60a0ac7209ac20dce6fc6e3a6a154528c6a6f015 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Tue, 5 Jul 2016 15:23:55 -0600
Subject: [PATCH 11/16] Make sure $STABLE_REV is set before setting up
 SaltStack repo

Fixes #882

When installing salt on Amazon Linux with a git reference, the $STABLE_REV
variable might not be set yet, causing malformed baseurl and gpgkey links
referenced in the /etc/yum.repos.d/saltstack-repo.repo file. We need to
ensure this variable is set before setting up the repo file.
---
 bootstrap-salt.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 951f0f6e6..bdd5f6868 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4087,6 +4087,14 @@ _eof
 }
 
 install_amazon_linux_ami_git_deps() {
+
+    # When installing from git, this variable might not be set yet for amazon linux. Set this
+    # to "latest" in order to set up the SaltStack repository and avoid a malformed baseurl
+    # and gpgkey reference in the install_amazon_linux_amI_deps function. 
+    if [ "$STABLE_REV" = "" ]; then
+        STABLE_REV="latest"
+    fi
+
     install_amazon_linux_ami_deps || return 1
 
     if ! __check_command_exists git; then
@@ -4103,7 +4111,6 @@ install_amazon_linux_ami_git_deps() {
         fi
     fi
 
-
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
         _TEMP_CONFIG_DIR="${_SALT_GIT_CHECKOUT_DIR}/conf/"

From 1075b74156d21c52c4704ab0694c3fa295ea92a4 Mon Sep 17 00:00:00 2001
From: Emiel Kollof <emiel.kollof@gmail.com>
Date: Wed, 6 Jul 2016 11:27:18 +0200
Subject: [PATCH 12/16] Fix typo in repository configuration

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 951f0f6e6..643844998 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4415,7 +4415,7 @@ __configure_freebsd_pkg_details() {
         echo "    url: \"${SALTPKGCONFURL}\","
         echo "    mirror_type: \"http\","
         echo "    enabled: true"
-        echo "    prioroity: 10"
+        echo "    priority: 10"
         echo "}"
     } > $salt_conf_file
     FROM_SALTSTACK="-r SaltStack"

From 87ee956c7004e5fc8160baa2a971ee15b2807950 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Wed, 6 Jul 2016 14:27:09 -0600
Subject: [PATCH 13/16] Split-up python-requests and python-msgpack packages
 for newer Fedora

Fixes #875
---
 bootstrap-salt.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 643844998..e41244666 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3118,7 +3118,13 @@ install_fedora_deps() {
         __install_saltstack_copr_salt_repository || return 1
     fi
 
-    __PACKAGES="yum-utils PyYAML libyaml m2crypto python-crypto python-jinja2 python-msgpack python-zmq python-requests"
+    __PACKAGES="yum-utils PyYAML libyaml m2crypto python-crypto python-jinja2 python-zmq"
+
+    if [ "$DISTRO_MAJOR_VERSION" -ge 23 ]; then
+        __PACKAGES="${__PACKAGES} python2-msgpack python2-requests"
+    else
+        __PACKAGES="${__PACKAGES} python-msgpack python-requests"
+    fi
 
     if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
         __PACKAGES="${__PACKAGES} python-libcloud"

From 50106e5ccc2d14fb1219a214c232b57b84c1551e Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Thu, 7 Jul 2016 10:28:56 -0600
Subject: [PATCH 14/16] Add new contributors to authors list

---
 AUTHORS.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 1f5caa6c0..1df5846e9 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -35,6 +35,8 @@ Denys Havrysh               vutny                  denys.gavrysh@gmail.com
 deployboy                   deployboy
 Diego Woitasen              diegows                diego@flugel.it
 Elias Probst                eliasp
+eliezerlp                   eliezerlp
+Emiel Kollof                ekollof
 Erik Ankrom                 erikankrom
 Erik Johnson                terminalmage           erik@saltstack.com
 EYJ                         eyj
@@ -66,6 +68,7 @@ markgaylard                 markgaylard
 Matt Black                  mafrosis
 Matthew Garrett             cingeyedog             matt@clemson.edu
 Matthew Mead-Briggs         mattmb
+Matthew Richardson          mrichar1
 Matthew Willson             ixela
 Matthieu Guegan             mguegan
 Michael A. Smith            kojiromike             michaels@syapse.com
@@ -84,6 +87,7 @@ Pavel Snagovsky             paha
 Pedro Algarvio              s0undt3ch              pedro@algarvio.me
 Pedro Paulo                 pedropaulovc
 Peter Tripp                 notpeter
+Petr Michalec               epcim
 Prayag Verma                pra85                  prayag.verma@gmail.com
 ptonelli                    ptonelli
 Randy Thompson              beardedeagle           randy@heroictek.com

From 3b4719c6d37e6847adc8aeb7820cefd4a1cf9c64 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Thu, 7 Jul 2016 14:07:05 -0600
Subject: [PATCH 15/16] Update ChangeLog with new changes

---
 ChangeLog | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1392859f5..c1dd062be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
+Version 2016.07.07:
+    * Add new contributors to authors list. (rallytime) #910
+    * Split up python-requests and python-msgpack packages for newer Fedora. (rallytime) #909
+    * Fix typo in repository configuration for FreeBSD. (ekollof) #907
+    * Make sure $STABLE_REV is set before setting up SaltStack repo. (rallytime) #906
+    * Remove tests written question from template. (rallytime) #904
+    * Adding support for Linux Mint 18 (based on Ubuntu 16.04). (eliezerlp) #902
+    * Allow git installation for SLES 12. (rallytime) #903
+    * Set repo_arch for raspberry pi installs. (mrichar1) #899
+    * Change temporary directory for storing executable to C:\Windows\Temp. (themalkolm) #897
+    * add apt-transport-https for ubuntu. (epcim) #896
+    * Fix expanding shell script position parameters with nounset enabled. (vutny) #895
+    * RFC: Add tests for bootstrap-salt.ps1. (themalkolm) #893
+    * Keep original name of salt executable executable. (themalkolm) #857
+
 Version 2016.06.27:
-    * Fix race condition when doing one-liner bootstrap
-    * Add space back in between 'install' and '--install'
+    * Fix race condition when doing one-liner bootstrap. (vutny) #889
+    * Add space back in between 'install' and '--install'. (rallytime) #890
 
 Version 2016.06.24:
     * Save invocation command and arguments into variables. (jfindlay) #885

From 7083fe2be0c0a58c2ba1f788a8011abac0cd3ab0 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Thu, 7 Jul 2016 14:07:55 -0600
Subject: [PATCH 16/16] Update script version to 2016.07.07

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2a52a3f6e..4d9f2cc22 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -18,7 +18,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2016.06.27"
+__ScriptVersion="2016.07.07"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"