rallytime
7aa31ff030
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/grains/core.py
- salt/modules/git.py
- salt/modules/pillar.py
- salt/states/saltmod.py
- salt/states/user.py
- tests/integration/states/handle_iorder.py
2017-07-18 09:05:43 -06:00
Mike Place
c84d6db548
Merge pull request #42186 from rallytime/fix-42166
...
Use long_range function for IPv6Network hosts() function
2017-07-17 13:39:35 -05:00
Mike Place
866a1febb4
Merge pull request #42264 from rallytime/fix-41116
...
Update minion restart section in FAQ doc for windows
2017-07-17 12:40:39 -05:00
Mike Place
e588f235e0
Merge pull request #42269 from rallytime/fix-41721
...
Add some clarity to "multiple quotes" section of yaml docs
2017-07-17 12:38:17 -05:00
Mike Place
8f1cb287cf
Merge pull request #42126 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-07-17 12:07:18 -05:00
rallytime
c406046940
Add clarification to salt ssh docs about key auto-generation.
...
Fixes #42267
2017-07-14 11:57:58 -06:00
rallytime
f2250d474a
Add a note about using different styles of quotes.
2017-07-12 17:08:23 -06:00
rallytime
bd638880e3
Add mono-spacing to salt-minion reference for consistency
2017-07-12 09:36:07 -06:00
Denys Havrysh
6bb8b8f98c
Add missing doc for `utils_dirs` Minion config option
2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5
Utils: add example of module import
2017-07-12 11:08:34 +03:00
rallytime
38d9b3d553
Add some clarity to "multiple quotes" section of yaml docs
...
Fixes #41721
2017-07-11 17:28:45 -06:00
rallytime
30d62f43da
Update minion restart section in FAQ doc for windows
...
Fixes #41116
2017-07-11 16:24:29 -06:00
Thomas Dutrion
c31ded341c
Remove duplicate instruction in Openstack Rackspace config example
2017-07-11 16:01:15 -06:00
rallytime
b8bcc0d599
Add note to various network_hosts docs about long_run for IPv6 networks
2017-07-06 17:36:18 -06:00
Arthur Lutz
686926daf7
Update aws.rst - add Debian default username
2017-07-06 11:08:06 -06:00
Nicole Thomas
678d4d4098
Merge pull request #42141 from rallytime/bp-42098
...
Back-port #42098 to 2016.11
2017-07-06 09:11:49 -06:00
Ch3LL
e1694af39c
Update builds available for rc1
2017-07-05 17:06:06 -04:00
twangboy
bd80243233
Change repo_ng to repo-ng
2017-07-05 13:56:11 -06:00
Nicole Thomas
afc19048bd
Merge pull request #42131 from gtmanfred/release
...
Add stuff to release notes
2017-07-05 13:33:14 -06:00
Daniel Wallace
e2b3160c96
fix up PR
2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11
add note about roster_defaults
2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468
add release note about about extmod blacklist and whitelist
2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8
Update salt-master first before updating salt-minion
...
Fixes #42124
2017-07-05 10:23:07 -06:00
rallytime
8b35b367b3
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/dockerng.py
2017-07-05 09:14:30 -06:00
Ch3LL
d4e7b91608
Update releasecanddiate doc with new 2017.7.0rc1 Release
2017-07-03 23:06:54 -04:00
rallytime
c2822e05ad
Remove references in docs to pip install salt-cloud
...
Instead, provide the option to use "-L" with the Bootstrap script.
Fixes #41885
2017-07-03 14:47:36 -06:00
twangboy
5a5d70866a
Change repo_ng to repo-ng
2017-07-03 14:15:35 -06:00
Mike Place
ec378c73ff
Merge pull request #42020 from terminalmage/toctree-fix
...
Add the new docker state modules to the toctree
2017-06-30 15:58:27 -05:00
rallytime
c98470e557
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-06-30 10:00:10 -06:00
Ch3LL
1de5e008a0
Add initial 2016.11.7 Release Notes
2017-06-30 11:32:10 -04:00
rallytime
3b87dbca12
Add the 'provider' key to salt.cloud.CloudClient.create()
...
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.
Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.
Fixes #41971
2017-06-29 14:38:09 -06:00
Seth House
18dfa9893c
Re-add msgpack to mocked imports
2017-06-29 13:49:45 -06:00
Seth House
5592e6e5d4
Revert "Allow docs to be built under Python 3"
2017-06-29 13:32:09 -06:00
Erik Johnson
bfa9836336
Add the new docker state modules to the toctree
2017-06-29 12:31:58 -05:00
Erik Johnson
f13ddeb394
Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
...
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
2017-06-28 20:27:32 -05:00
David Boucha
bff050ad52
change out salt support link to SaltConf link
2017-06-28 14:54:01 -06:00
rallytime
7d7be2d375
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- doc/ref/configuration/master.rst
- tests/integration/states/test_archive.py
- tests/unit/transport/test_tcp.py
- tests/unit/transport/test_zeromq.py
2017-06-28 10:48:37 -06:00
Ch3LL
fe4f5711d5
[2016.11] Bump latest release version to 2016.11.6
2017-06-28 11:24:17 -04:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3
2017-06-27 11:46:47 -06:00
Mike Place
ff67d47a2e
Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection
...
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
2017-06-26 09:41:38 -05:00
Bo Maryniuk
c2b5e50d50
Add missing doc info for pressrelease
2017-06-26 14:38:19 +02:00
Mike Place
c89cd2a4bf
Merge pull request #41890 from cachedout/locale_doc
...
Locale doc
2017-06-22 12:34:46 -05:00
Mike Place
df5a112a9b
Merge pull request #41904 from twangboy/docs_win_add_firewall
...
Fix anchor to _linux-iptables
2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4
Fix anchor to _linux-iptables
2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks
2017-06-22 09:24:55 -06:00
Mike Place
679040c04b
Locale doc
2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980
Add additional commits to 2016.11.6 release notes
2017-06-21 17:15:11 -04:00
Mike Place
87a252fda7
Merge pull request #41852 from Ch3LL/rn_2017_py
...
Update 2017 Release Notes with Python Messages
2017-06-20 12:17:04 -05:00
Mike Place
f720a849ba
Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers
...
Things, that didn't made to 2017.7 for some reasons
2017-06-20 09:28:21 -05:00
Ch3LL
75f93edff2
Update 2017 Release Notes with Python Messages
2017-06-20 09:55:13 -04:00
