mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
2015.2 -> 2015.5
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
This commit is contained in:
parent
160f703296
commit
8074d16d52
@ -218,7 +218,7 @@ Create the Build Environment
|
||||
Right-click on the file named **dev_env_salt.ps1** and select **Run with
|
||||
Powershell**
|
||||
|
||||
This will clone salt into ``C:\Salt-Dev\salt`` and set it to the 2015.2
|
||||
This will clone salt into ``C:\Salt-Dev\salt`` and set it to the 2015.5
|
||||
branch. You could optionally run the command from a powershell window with a
|
||||
``-Version`` switch to pull a different version. For example:
|
||||
|
||||
|
@ -129,7 +129,7 @@ configuration file named ``master``.
|
||||
Minion Config
|
||||
---------------
|
||||
|
||||
.. versionadded:: 2015.2.1
|
||||
.. versionadded:: 2015.5.1
|
||||
|
||||
Minion config options can be defined globally using the master configuration
|
||||
option ``ssh_minion_opts``. It can also be defined on a per-minion basis with
|
||||
|
@ -49,7 +49,7 @@ painful in windows.
|
||||
|
||||
To do this you just use pip with git to update to the version you want and then
|
||||
restart the service. Here is a sample state file that upgrades salt to the head
|
||||
of the 2015.2 branch:
|
||||
of the 2015.5 branch:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
@ -57,7 +57,7 @@ of the 2015.2 branch:
|
||||
pip.installed:
|
||||
- cwd: 'C:\salt\bin\scripts'
|
||||
- bin_env: 'C:\salt\bin\scripts\pip.exe'
|
||||
- editable: git+https://github.com/saltstack/salt@2015.2#egg=salt
|
||||
- editable: git+https://github.com/saltstack/salt@2015.5#egg=salt
|
||||
- upgrade: True
|
||||
|
||||
restart_service:
|
||||
|
Loading…
Reference in New Issue
Block a user