rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/modules/pip.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/runners/manage.py
- salt/states/pkg.py
- salt/transport/zeromq.py
- salt/utils/event.py
- tests/integration/modules/test_pip.py
- tests/integration/states/test_user.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_archive.py
- tests/unit/utils/test_boto.py
2018-01-23 13:26:43 -05:00
rallytime
e0ffa32b49
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/integration/modules/test_pkg.py
2018-01-19 10:09:36 -05:00
Nicole Thomas
28554ca935
Merge pull request #45389 from DSRCorporation/bugs/42626_pub_acl_doc
...
Docs update for function args limit in pub acl.
2018-01-18 17:56:10 -05:00
Nicole Thomas
3dc3e4e690
Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix
...
Isbm ssdp spurious errors fix
2018-01-18 07:07:01 -05:00
rallytime
4b64a3964e
Update function new name in release notes
2018-01-17 12:45:12 -05:00
Dmitry Kuzmenko
f33ebcada0
Doc note about user names regex matching in pub acl and eauth.
2018-01-17 17:49:19 +03:00
Denys Havrysh
0d79b9eaff
[DOC] Suggest to upgrade pygit2 and deps
2018-01-17 15:24:15 +02:00
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7'
2018-01-16 17:19:08 -05:00
Dmitry Kuzmenko
e29c0ff19e
Docs update for function args limit in pub acl.
2018-01-16 23:02:28 +03:00
Bo Maryniuk
59df24fc02
Docs update
2018-01-15 14:31:25 +01:00
Bo Maryniuk
b1bd992b1e
Add more doc fixes
2018-01-15 14:31:25 +01:00
Bo Maryniuk
5cc6daae09
Fix doc typos
2018-01-15 14:31:25 +01:00
Bo Maryniuk
b1b48f89db
Update autodiscovery documentation
2018-01-15 14:31:25 +01:00
Mircea Ulinic
6816e4f290
Document the utils refactor
2018-01-14 08:31:16 -05:00
Nicole Thomas
4d03162227
Merge pull request #45396 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2018-01-14 07:44:37 -05:00
Nicole Thomas
1755af821d
Merge pull request #44866 from DSRCorporation/slots3
...
Slots: use execution function return as a state arg value
2018-01-12 13:58:16 -05:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/config/__init__.py
- salt/daemons/masterapi.py
- salt/proxy/dummy.py
- salt/states/file.py
- tests/integration/modules/test_state.py
- tests/integration/runners/test_runner_returns.py
- tests/integration/ssh/test_state.py
- tests/support/parser/__init__.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_file.py
2018-01-11 16:00:08 -05:00
Damon Atkins
10a7501ede
Update release notes
2018-01-12 03:11:07 +11:00
Dmitry Kuzmenko
c205c10e89
Added Slots release note.
2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
fe87704ff2
Slots: @terminalmage code review fixes.
2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
b55bba0d46
Slots documentation.
2018-01-11 14:05:58 +03:00
Nicole Thomas
dbe21b2c0d
Merge pull request #45369 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-10 17:14:04 -05:00
rallytime
f65e091df8
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-01-10 10:15:19 -05:00
Erik Johnson
ef76bc6fcd
Update documentation for update intervals feature
2018-01-09 19:11:17 -06:00
David Boucha
a82e158f2d
gate the minion data cache refresh events.
2018-01-09 15:52:16 -07:00
Gareth J. Greenaway
9a15ec3430
Updating versionadded string. Fixing typo.
2018-01-08 13:53:56 -08:00
Gareth J. Greenaway
edfc3dc078
Adding in documention for auth_events configuration option
2018-01-05 12:29:21 -08:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/client/ssh/wrapper/state.py
- salt/modules/yumpkg.py
2018-01-04 17:45:29 -05:00
Damon Atkins
325a9f0f66
Update 2016.11.9.rst
2018-01-05 01:51:14 +11:00
Damon Atkins
4da9200b9c
Update 2016.11.9.rst
2018-01-05 01:46:20 +11:00
Damon Atkins
126aee36ac
Update 2016.11.9.rst
2018-01-05 01:38:22 +11:00
Damon Atkins
1c01967943
Update 2016.11.9.rst
2018-01-05 01:36:57 +11:00
sumeetisp
1b4806e2b9
Updating python version
...
As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency
2018-01-04 10:56:56 +05:30
Erik Johnson
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly
...
Without allow_unicode=True, unicode characters are processed through the
str representer and on Python 2 are dumped as a Unicode code point (i.e.
a literal \u0414). This commit makes allow_unicode=True the default in
our salt.utils.yamlloader.safe_dump() helper. It also adds a new
salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also
makes allow_unicode=True the default.
To make importing and using our custom yaml loader/dumper easier, a
convenience module called salt.utils.yaml has been added, which does a
wildcard import from both salt.utils.yamldumper and
salt.utils.yamlloader.
Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to
salt.utils.yaml, to ensure that unicode is handled properly.
2018-01-03 14:14:21 -06:00
Daniel Wallace
262405b0e8
split out publishing to ssh minions
...
and clean up docs
2017-12-28 07:49:06 -07:00
Daniel Wallace
7d55924cf1
this makes this all work with syndics
...
Any help would be great here, for some reason the jid gets updated and changed
somewhere in here, but only when using a syndic.
2017-12-28 07:49:05 -07:00
Daniel Wallace
b866c5f55d
fix option name
2017-12-28 07:49:05 -07:00
Daniel Wallace
38aeb7ad5f
add enable_ssh documentation
2017-12-28 07:49:05 -07:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly
...
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
2017-12-27 09:30:58 -06:00
Nicole Thomas
b0a23548f3
Merge pull request #45088 from twangboy/win_custom_config
...
Add `/custom-config` switch to Windows installer
2017-12-22 10:19:59 -05:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- salt/config/__init__.py
- salt/grains/core.py
- salt/modules/win_lgpo.py
- salt/returners/mysql.py
- salt/states/libcloud_dns.py
- tests/integration/runners/test_runner_returns.py
- tests/unit/grains/test_core.py
2017-12-21 15:58:08 -05:00
twangboy
467013a08f
Fix punctuation and erroneous characters
2017-12-21 13:11:24 -07:00
twangboy
50b247a001
Update docs and help
2017-12-20 19:43:26 -07:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-12-20 10:26:10 -05:00
Vernon Cole
0bdb46dab9
add clouds modules to index
2017-12-20 06:58:09 -05:00
twangboy
42607982cb
Update docs for new support
...
Fix some types in the help for the installer
2017-12-19 11:10:05 -07:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-16 08:16:57 -05:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated
...
[Oxygen] [DOC] Add doc page reference for schedule util module
2017-12-15 14:49:48 -05:00
Nicole Thomas
653ad2a224
Merge pull request #44946 from terminalmage/unicode-file
...
[PY3] Update file state/execution modules and associated files with unicode_literals
2017-12-14 16:26:50 -05:00
