Merge pull request #1303 from s0undt3ch/stable

Merge Develop Branch into Stable for Release

Author: s0undt3ch

.kitchen.yml

@@ -46,6 +46,11 @@ platforms:
       run_command: /sbin/init
       provision_command:
         - yum install -y upstart
+  - name: amazon-2
+    driver_config:
+      image: amazonlinux:2
+      platform: rhel
+      run_command: /usr/lib/systemd/systemd
   - name: ubuntu-18.04
     driver_config:
       run_command: /lib/systemd/systemd
@@ -83,12 +88,14 @@ suites:
   - name: py2-git-2017.7
     provisioner:
       salt_version: 2017.7
+    excludes:
+      - arch
   - name: py2-git-2018.3
     provisioner:
       salt_version: 2018.3
-  - name: py2-git-fluorine
+  - name: py2-git-2019.2
     provisioner:
-      salt_version: fluorine
+      salt_version: 2019.2
   - name: py2-git-develop
     provisioner:
       salt_version: develop

.travis.yml

@@ -20,6 +20,7 @@ env:
   - PLATFORM=centos-7
   - PLATFORM=centos-6
   - PLATFORM=amazon-1
+  - PLATFORM=amazon-2
   - PLATFORM=ubuntu-1804
   - PLATFORM=ubuntu-1604
   - PLATFORM=ubuntu-1404

AUTHORS.rst

@@ -38,11 +38,13 @@ Megan Wilhite               Ch3LL                  megan.wilhite@gmail.com
 Chris Rebert                cvrebert               chris.rebert@hulu.com
 Chris Buechler              cbuechler              cmb@pfsense.org
 Christer Edwards            cedwards
+Christian McHugh            mchugh19
 Clark Perkins               iclarkperkins          clark.perkins@digitalreasoning.com
 Dag Viggo Lokøen            dagvl                  dag.viggo@lokoen.org
 Dan Mick                    dmick                  dan.mick@inktank.com
 Daniel Poelzleithner        poelzi
 Daniel Wallace              gtmanfred              danielwallace@gtmanfred.com
+Darko Cerdic                darkocerdic
 David J. Felix              DavidJFelix
 denmat                      denmat
 Denys Havrysh               vutny                  denys.gavrysh@gmail.com
@@ -77,6 +79,7 @@ Jasper Lievisse Adriaanse   jasperla               jasper@humppa.nl
 JD                          decomposite
 Jeff Hui                    jeffh                  jeff@jeffhui.net
 Jeff Strunk                 jstrunk
+Jorge Schrauwen             sjorge                 sjorge@blackdot.be
 Juan A. Moyano              wincus                 wincus.public@gmail.com
 Justin Anderson             justinta               justin.ta@outlook.com
 Justin Findlay              jfindlay               jfindlay@gmail.com
@@ -94,6 +97,7 @@ Marcus Furlong              furlongm               furlongm@gmail.com
 Mark Lee                    malept
 markgaylard                 markgaylard
 Matt Black                  mafrosis
+Matt McKinnon               ripesensor
 Matthew Garrett             cingeyedog             matt@clemson.edu
 Matthew Mead-Briggs         mattmb
 Matthew Richardson          mrichar1

CONTRIBUTING.md

@@ -140,7 +140,9 @@ key to your GitHub account. Once these steps are completed, the commit signing
 verification will look like the example in GitHub's
 [GPG Signature Verification feature announcement](https://github.com/blog/2144-gpg-signature-verification).
 
-## Release Cadence
+## Release Information
+
+### Release Cadence
 
 There is no defined release schedule for the bootstrap script at this time.
 Typically, SaltStack's release team determines when it would be good to release
@@ -154,6 +156,21 @@ Timing the release usually involves an analysis of the following:
 - Fixes needed for inclusion in an upcoming version of [Salt](https://github.com/saltstack/salt)
 - Length of time since the last bootstrap release
 
+### Release Process
+
+The release process consists of the following steps:
+
+1. Merge in any outstanding PRs that are ready.
+1. Add new contributors to the [AUTHORS](https://github.com/saltstack/salt-bootstrap/blob/develop/AUTHORS.rst) file.
+1. Update the [ChangeLog](https://github.com/saltstack/salt-bootstrap/blob/develop/ChangeLog).
+1. Update the version number in the bootstrap script. The version number is date-based, `<year.month.day>`.
+   For example, version `2018.08.15` was released on August 15, 2018.
+1. Merge the `develop` branch into the `stable` branch.
+1. Update `bootstrap.saltstack.com` with the new stable release. The checksum on the
+   [README page](https://github.com/saltstack/salt-bootstrap/blob/develop/README.rst)
+   should also be updated.
+1. Merge the new stable release into [Salt](https://github.com/saltstack/salt).
+
 ## Adding Support for Other Operating Systems
 
 The following operating systems are detected, but Salt and its dependency

ChangeLog

@@ -1,6 +1,6 @@
    Salt Bootstrap - Generic Salt Bootstrap Script
 
-   Copyright 2012-2017 Salt Stack (saltstack.org)
+   Copyright 2012-2019 SaltStack (saltstack.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -13,4 +13,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-

LICENSE

@@ -28,6 +28,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2018.08.15: ``6d414a39439a7335af1b78203f9d37e11c972b3c49c519742c6405e2944c6c4b``
 - 2018.08.13: ``98284bdc2b5ebaeb619b22090374e42a68e8fdefe6bff1e73bd1760db4407ed0``
 - 2018.04.25: ``e2e3397d6642ba6462174b4723f1b30d04229b75efc099a553e15ea727877dfb``
 - 2017.12.13: ``c127b3aa4a8422f6b81f5b4a40d31d13cec97bf3a39bca9c11a28f24910a6895``
@@ -43,6 +44,9 @@ Contributing
 The Salt Bootstrap project is open and encouraging to code contributions. Please review the
 `Contributing Guidelines`_ for information on filing issues, fixing bugs, and submitting features.
 
+The `Contributing Guidelines`_ also contain information about the Bootstrap release cadence and
+process.
+
 Examples
 --------
 
@@ -321,7 +325,7 @@ UNIX systems
 
 **SunOS**:
 
-- SmartOS
+- SmartOS (2015Q4 and later)
 
 Unsupported Distributions
 -------------------------