Nicole Thomas
6252f82f58
Merge pull request #44133 from cachedout/fix_paralell_docs
...
Fix typos in parallel states docs
2017-10-17 11:24:18 -04:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough
2017-10-16 20:27:56 -04:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs
2017-10-16 16:43:10 -06:00
Nicole Thomas
2fba45cd3f
Merge pull request #44125 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.2 to 2017.7
2017-10-16 16:02:24 -04:00
Nicole Thomas
888e5f51a2
Merge pull request #44121 from benediktwerner/2017.7
...
Fixed code snippet in unit testing documentation
2017-10-16 14:28:36 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7'
...
Conflicts:
- doc/topics/releases/2017.7.2.rst
2017-10-16 13:53:13 -04:00
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc
2017-10-16 17:23:23 +02:00
rallytime
bbec47afbc
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/utils/aws.py
2017-10-16 08:57:50 -04:00
Nicole Thomas
a85837d72b
Merge pull request #44066 from Ch3LL/cherry_release
...
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes
2017-10-12 09:33:59 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-10-10 16:34:52 -04:00
David A. Pocock
385980c21a
Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo
2017-10-10 15:06:18 -05:00
David A. Pocock
266dc00a23
Typo correction of lover to lower
2017-10-10 15:04:00 -05:00
Nicole Thomas
d61300df20
Merge pull request #44023 from Ch3LL/11.9rn
...
Add 2016.11.9 Release Note File
2017-10-10 16:03:01 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File
2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File
2017-10-10 15:31:19 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial
2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index
2017-10-10 19:02:35 +02:00
Mike Place
e434c39c4e
Merge pull request #43960 from cro/ldap_nopw_bind2
...
Require that bindpw be non-empty when auth.ldap.anonymous is False
2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177
Merge pull request #43991 from Ch3LL/3.8_sec_2
...
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 15:00:24 -07:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes
2017-10-09 16:26:13 -04:00
garethgreenaway
8d56a5ac45
Merge pull request #43776 from Ch3LL/2016.11.8_docs
...
[2016.11] Bump latest and previous versions
2017-10-09 10:22:14 -07:00
garethgreenaway
a4358dfa36
Merge pull request #43777 from Ch3LL/2017.7.2_docs
...
[2017.7] Bump latest and previous versions
2017-10-09 10:21:56 -07:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes
2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes
2017-10-09 13:03:23 -04:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False
2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements
2017-10-06 15:33:10 -06:00
Nicole Thomas
f880ac4c08
Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway
...
Fix typo in salt-cloud scaleway documentation
2017-10-05 14:57:59 -04:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/modules/test_state.py
2017-10-05 12:09:40 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation
...
s/scalewa/scaleway
2017-10-04 23:23:00 +00:00
David Boucha
8c671fd0c1
Update SaltConf banner per Rhett's request
2017-10-03 10:07:28 -06:00
rallytime
2337904656
Add updated release notes to 2017.7.2 branch
2017-10-02 17:18:30 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6
2017-09-28 11:50:54 -04:00
Ch3LL
410c624f7a
[2017.7] Bump latest and previous versions
2017-09-27 12:25:30 -04:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions
2017-09-27 12:24:09 -04:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99
Merge pull request #43761 from Ch3LL/release_2017.7.2
...
Release Notes for 2017.7.2
2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes
2017-09-26 17:21:24 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/daemons/masterapi.py
- salt/master.py
- salt/runners/cache.py
2017-09-26 16:46:43 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
Mike Place
3a79549af4
Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex
...
Bugs/43124 users regex
2017-09-22 13:21:08 -06:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- tests/unit/utils/test_parsers.py
2017-09-22 09:40:03 -04:00
Mike Place
ff832ee607
Merge pull request #43673 from rallytime/bp-43652
...
Back-port #43652 to 2016.11
2017-09-21 10:37:35 -06:00
Mike Place
365cb9fba8
Merge pull request #43677 from terminalmage/runners-docs-2016.11
...
Fix RST headers for runners (2016.11 branch)
2017-09-21 10:35:56 -06:00
Erik Johnson
c0a79c70a4
Fix RST headers for runners (2017.7 branch)
...
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
2017-09-21 10:27:12 -05:00
Erik Johnson
2fd88e94fa
Fix RST headers for runners (2016.11 branch)
...
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
2017-09-21 10:11:28 -05:00
Raymond Piller
d91c47c6f0
Salt Repo has Deb 9 and 8
2017-09-21 10:24:41 -04:00
Silvio Moioli
625eabb83f
multiprocessing minion option: documentation fixes
2017-09-21 10:55:52 +02:00
