saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recommend master salt branch instead of develop

Browse source 
Latest development branch in Open Salt repo is currently `master` not
`develop`.
This commit is contained in:
Dmitry Kuzmenko 2020-04-08 14:23:09 +03:00 • committed by Pedro Algarvio
parent 3eaa27f031
commit 445b301b64
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -28,7 +28,7 @@ Please read the following guidelines before you
```
curl -o bootstrap-salt.sh -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh
sudo sh bootstrap-salt.sh git develop
sudo sh bootstrap-salt.sh git master
```
3. **Isolate the demonstrable problem** -- make sure that the

14
README.rst
View file

@ -80,7 +80,7 @@ Using ``curl`` to install latest development version from GitHub:
.. code:: console
curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
sudo sh bootstrap-salt.sh git develop
sudo sh bootstrap-salt.sh git master
If you want to install a specific release version (based on the Git tags):
@ -101,7 +101,7 @@ If all you want is to install a ``salt-master`` using latest Git:
.. code:: console
curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
sudo sh bootstrap-salt.sh -M -N git develop
sudo sh bootstrap-salt.sh -M -N git master
If your host has Internet access only via HTTP proxy:
@ -143,14 +143,14 @@ If you already have Python installed, ``python 2.7``, then it's as easy as:
.. code:: console
python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh
sudo sh bootstrap-salt.sh git develop
sudo sh bootstrap-salt.sh git master
With python version 2, the following in-line code should always work:
.. code:: console
python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh
sudo sh bootstrap-salt.sh git develop
sudo sh bootstrap-salt.sh git master
With python version 3:
@ -214,11 +214,11 @@ Using ``wget`` to install your distribution's stable packages:
wget -O - https://bootstrap.saltstack.com | sudo sh
Installing the latest develop branch of Salt:
Installing the latest master branch of Salt:
.. code:: console
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git develop
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git master
Supported Operating Systems
@ -242,7 +242,7 @@ You also may need to disable repository configuration and allow ``pip`` installa
.. code:: console
sudo sh bootstrap-salt.sh -r -P git develop
sudo sh bootstrap-salt.sh -r -P git master
**NOTE**