Megan Wilhite
a4c5417d23
Merge pull request #46132 from rallytime/2016.11_update_version_doc
...
Update release versions for the 2016.11 branch
2018-02-26 11:43:32 -05:00
rallytime
d2196b6df3
Update release versions for the 2016.11 branch
2018-02-21 06:37:18 -05:00
Nicole Thomas
e197a0fbc5
Merge pull request #46076 from rallytime/bp-46066
...
Back-port #46066 to 2016.11
2018-02-20 16:48:41 -05:00
Nicole Thomas
c72c1bde5f
Merge pull request #46093 from wedge-jarrad/contributing-doc-typo
...
Fix contributing doc typo
2018-02-20 12:37:27 -05:00
Wedge Jarrad
5a0fe104f7
Fix contributing doc typo
2018-02-18 10:57:28 -08:00
rallytime
b94d73c53e
Pin tornado version in requirements file
...
tornado needs to be >= 4.2.1, but less that 5.0.
Tornado 5.0 is introducing backwards-incompatible changes. Therefore,
we need to pin the version of tornado in base.txt until we can fix
supporting Tornado 5.0 in Salt.
Refs #45790
2018-02-16 12:05:18 -05:00
Nicole Thomas
3cb83ea87e
Merge pull request #45992 from bgridley/fix-routes-present-state
...
Add vpc_peering_connection_id to describe_route_tables route_keys
2018-02-15 13:56:55 -05:00
Nicole Thomas
8a60635da0
Merge pull request #46000 from terminalmage/issue45910
...
salt.states.reg.present: Prevent traceback when reg data is binary
2018-02-14 10:55:41 -05:00
Erik Johnson
8cf13325ee
salt.states.reg.present: Prevent traceback when reg data is binary
...
This prevents a failed decode of undecodable data from resulting in a
traceback by catching the exception and just using the original value in
the changes dict.
2018-02-13 16:23:55 -06:00
Nicole Thomas
1f44e285dc
Merge pull request #46011 from terminalmage/fix-solaris-runas
...
cmdmod.py: runas workaround for platforms that don't set a USER env var
2018-02-13 17:03:10 -05:00
Erik Johnson
8ee0a3a28b
Move Solaris USER workaround up a bit
...
In its previous position, the run_env would not get the workaround when
clean_env was set to True.
2018-02-13 13:42:20 -06:00
Erik Johnson
13cdb52690
cmdmod.py: runas workaround for platforms that don't set a USER env var
...
Solaris doesn't set a USER env var in its default environment, that is
if you run `su - someuser -c env` you get a HOME, PWD, LOGNAME, etc. env
var, but not a USER. This commit makes sure that the USER env var is set
to the runas user.
2018-02-13 11:41:41 -06:00
Nicole Thomas
30fb8f7be0
Merge pull request #45467 from twangboy/win_exclude_hidden
...
Exclude hidden directories in pkg.refresh_db
2018-02-13 11:07:07 -05:00
Ben Gridley
679787699c
Add vpc_peering_connection_id to describe_route_tables route_keys
...
This is required to fix state module function _routes_present when using a vpc_peering_connection.
2018-02-12 16:06:32 -07:00
twangboy
ea41215646
Make the regex pattern less greedy
2018-02-12 14:03:31 -07:00
twangboy
6d223cffa7
Add tip about passing bogus saltenv
2018-02-12 14:03:31 -07:00
twangboy
1282ae3a93
Skip hidden first
2018-02-12 14:03:30 -07:00
twangboy
437a457911
Skip hidden dirs in genrepo
2018-02-12 14:03:30 -07:00
twangboy
87dc554dc3
Add final updates to docs
2018-02-12 14:03:30 -07:00
twangboy
3646d5c897
Fix some docs formatting, add some warnings
2018-02-12 14:03:30 -07:00
twangboy
35c81faf5a
Log the source_dir when caching the files
2018-02-12 14:03:29 -07:00
twangboy
91c3da8dfd
Improve docs for pkg.refresh_db
2018-02-12 14:03:29 -07:00
twangboy
4803d92707
Add some documentation
2018-02-12 14:03:29 -07:00
twangboy
08b82e0875
Fix lint error, use raw
2018-02-12 14:03:29 -07:00
twangboy
2f712691cf
Exclude hidden directories in pkg.refresh_db
2018-02-12 14:03:28 -07:00
Nicole Thomas
7779fea7ba
Merge pull request #45940 from dmurphy18/fix_aix_cmdmod
...
Fix use of su to use '-' on AIX
2018-02-09 07:09:10 -05:00
David Murphy
dd2788419b
Fix use of 'su' for AIX to use '-'
2018-02-08 17:43:30 -07:00
Nicole Thomas
27ff82f996
Merge pull request #45864 from rallytime/release-note-fix
...
Remove extraneous ] in release notes for 2016.11.9
2018-02-06 09:31:09 -05:00
rallytime
104a24f244
Remove extraneous ] in release notes for 2016.11.9
2018-02-05 16:34:19 -05:00
Nicole Thomas
5fa010de2b
Merge pull request #45787 from rallytime/2016.11.9_docs
...
[2016.11] Bump latest and previous versions
2018-02-05 10:30:20 -05:00
Nicole Thomas
746386d04c
Merge pull request #45794 from vutny/doc-file-state-examples
...
[DOC] Fix code-block rST directive in file state module
2018-01-31 09:41:08 -05:00
Denys Havrysh
ddfeae6a29
[DOC] Fix code-block rST directive in file state module
2018-01-31 12:04:20 +02:00
rallytime
a38d4d44fa
[2016.11] Bump latest and previous versions
2018-01-30 15:35:55 -05:00
Nicole Thomas
abc9ece214
Merge pull request #45780 from vutny/doc-pkgrepo-zypper
...
[DOC] Add missing gpgautoimport for pkgrepo.managed
2018-01-30 14:10:47 -05:00
Denys Havrysh
f80c7d8d69
[DOC] Add missing gpgautoimport for pkgrepo.managed
2018-01-30 16:44:01 +02:00
Nicole Thomas
d7e09e2649
Merge pull request #45749 from vutny/fix-typo
...
The `zypper.mod_repo`: fix typo in the docstring
2018-01-29 09:39:59 -05:00
Nicole Thomas
cb6ce378ea
Merge pull request #45459 from vutny/salt-cloud-fix-loading-utf-cache
...
[2016.11] Salt Cloud: fix loading UTF-8 cached data
2018-01-29 08:57:22 -05:00
Denys Havrysh
e80bfb20c6
The zypper.mod_repo
: fix typo in the docstring
2018-01-29 15:47:14 +02:00
Denys Havrysh
b370796e9d
Salt Cloud: write/read cached data in UTF-8 explicitly
2018-01-29 11:06:59 +02:00
Denys Havrysh
cd999201be
[2016.11] Salt Cloud: fix loading UTF-8 cached data
...
Fixes #20823
2018-01-29 11:06:47 +02:00
Nicole Thomas
e4047a1234
Merge pull request #45511 from twangboy/win_fix_git
...
Add correct path to ssh.exe for Windows
2018-01-25 17:16:09 -05:00
Nicole Thomas
a550e8d25d
Merge pull request #45694 from twangboy/win_reg_add_keys
...
Add support for additional reg keys
2018-01-25 16:39:23 -05:00
twangboy
8f53cd2d68
Add new keys to subkey_slash_check
2018-01-25 11:09:30 -07:00
twangboy
62050c711c
Add support for additional reg keys
...
HKEY_CLASSES_ROOT
HKEY_CURRENT_CONFIG
2018-01-25 10:39:27 -07:00
Nicole Thomas
7ceebf62f0
Merge pull request #45577 from zer0def/fix-git-detached-31363
...
git.detached with force_clone fails when it can't create a target directory that already exists
2018-01-25 09:32:10 -05:00
Nicole Thomas
3a6837e232
Merge pull request #45675 from Ch3LL/rn_2016.11.9
...
Add new commits to 2016.11.9 release notes
2018-01-24 17:29:33 -05:00
Ch3LL
7b5bed36d9
Add new commits to 2016.11.9 release notes
2018-01-24 16:16:52 -05:00
Erik Johnson
915e259bad
Merge pull request #45663 from rallytime/bp-45452-2016.11
...
Back-port #45452 to 2016.11
2018-01-24 09:32:51 -06:00
Nicole Thomas
ecd75c137f
Merge pull request #45651 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.11.9 to 2016.11
2018-01-24 10:26:32 -05:00
Alejandro del Castillo
ae94fb61d9
opkg.py: make owner function return value, instead of iterator
...
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-01-24 10:18:56 -05:00