Nicole Thomas
9b364e25cf
Merge pull request #47147 from eliasp/2018.3-issue-45939-shadow-hash-salt
...
states.user.present: Make usage of `hash_password` idempotent
2018-06-30 09:29:27 -04:00
Nicole Thomas
7e25f26837
Merge pull request #48362 from twangboy/fix_48276
...
Fix stacktrace when registry entries are missing
2018-06-30 09:20:00 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-06-30 08:57:34 -04:00
Andre Sencioles
430c462f34
Fix issue #48367 using the same approach as PR #46776
2018-06-29 15:53:07 -04:00
Daniel Wallace
80222b6b7c
Merge pull request #48383 from rallytime/bp-48379
...
Back-port #48379 to 2017.7
2018-06-29 14:48:37 -05:00
William Giokas
9fc7815594
Clean up the workspaces at the end for every job
2018-06-29 15:47:30 -04:00
Daniel Wallace
aa68aa774a
Merge pull request #48382 from rallytime/bp-48346
...
Back-port #48346 to 2017.7
2018-06-29 14:45:11 -05:00
William Giokas
6a70ba222e
Use the right ssh key to destroy kitchen
2018-06-29 15:43:55 -04:00
Daniel Wallace
9519f640e7
Merge pull request #48381 from rallytime/bp-48330
...
Back-port #48330 to 2017.7
2018-06-29 14:43:45 -05:00
William Giokas
6857bedcc2
Add warnings plugin to replace violations
...
This plugin has no violations. There is **NO DOCUMENTATION** for this
entire plugin. And I still don't entirely understand how this being the
name of a step makes it work.
2018-06-29 15:42:28 -04:00
Ch3LL
8fdd34d430
m2crypto open file in rb mode for pub key
2018-06-29 14:43:06 -04:00
rallytime
9498618418
Use saltenv opts instead of environment
2018-06-29 14:15:21 -04:00
twangboy
77629f640a
Fix module unit tests
2018-06-29 11:15:23 -06:00
twangboy
b5ca560b73
Fix lint error
2018-06-29 10:37:36 -06:00
twangboy
210e280ecf
Use explicit parameter names
...
Optimize lookups
80 character lines
2018-06-28 16:28:09 -06:00
Daniel Wallace
c5746deb5f
Merge pull request #48364 from dubb-b/2018.3
...
Changing debug to info for logging
2018-06-28 15:48:23 -05:00
Brett Benassi
d8260b6628
Changing debug to info for logging
2018-06-28 14:46:31 -06:00
Daniel Wallace
14db0aa35d
Merge pull request #48363 from dubb-b/2017.7
...
Changing debug to info for logging
2018-06-28 15:45:16 -05:00
Brett Benassi
c0b962e28d
Changing debug to info for logging
2018-06-28 14:43:08 -06:00
Nicole Thomas
0202493b60
Merge pull request #48354 from rallytime/merge-2018.3.2-to-2018.3
...
[2018.3] Merge forward from 2018.3.2 to 2018.3
2018-06-28 16:26:30 -04:00
twangboy
776db98a5c
Handle missing registry entries
2018-06-28 12:59:36 -06:00
Daniel A. Wozniak
e8362adf71
fopen does not support encoding
2018-06-28 10:16:52 -07:00
Ch3LL
a964db4663
Fix corrupt public key with m2crypto python3
2018-06-28 11:31:21 -04:00
rallytime
fface7cc74
Merge branch '2018.3.2' into '2018.3'
...
Conflicts:
- tests/integration/runners/test_state.py
2018-06-28 10:05:18 -04:00
Nicole Thomas
5b29cd326f
Merge pull request #48352 from Ch3LL/wheel_doc
...
Add missing key to accept_dict function in wheel docs
2018-06-28 09:54:36 -04:00
Nicole Thomas
02cf19ee3b
Merge pull request #48329 from rallytime/codeowners-roster-files
...
Trigger review requests for team-ssh for roster files
2018-06-28 09:53:41 -04:00
Ch3LL
89ada68165
Add missing key to accept_dict function in wheel docs
2018-06-28 09:46:19 -04:00
Daniel Wallace
53cf1794be
Merge pull request #48349 from ralex/fix-manjaro-service-behaviour
...
Disable the "service" module on Manjaro since it is using systemd
2018-06-28 08:32:36 -05:00
Nicole Thomas
bbabbbf76b
Merge pull request #48347 from dwoz/sigfix
...
Fixes fileserver maintenance process on Windows
2018-06-28 09:17:42 -04:00
Alexandre Amor
6cafce547e
Disable the service module on Manjaro since it is using systemd
2018-06-28 09:32:48 +02:00
Daniel A. Wozniak
487161ba8f
Fix file encoding on windows
2018-06-27 18:33:18 -07:00
Daniel A Wozniak
fc760685ee
Fix multiple git module tests
2018-06-27 18:28:58 -07:00
Daniel A. Wozniak
ccdff5029f
Remove unneeded attribute
2018-06-27 17:08:03 -07:00
Nicole Thomas
67303d7901
Merge pull request #47975 from terminalmage/issue47937
...
Add a new git.cloned state
2018-06-27 16:53:41 -04:00
Nicole Thomas
34b24bb7fa
Merge branch '2018.3' into issue47937
2018-06-27 13:41:34 -04:00
Erik Johnson
4433bec891
Add release notes for tojson jinja filter
2018-06-27 12:36:30 -05:00
Erik Johnson
ac36998801
Tweak docs to reflect backported filter
2018-06-27 12:28:34 -05:00
Erik Johnson
c636b18cf0
Add unit test for tojson filter
2018-06-27 12:23:29 -05:00
Erik Johnson
e34e39f0e2
Document filter deprecation
2018-06-27 12:23:29 -05:00
Erik Johnson
b9a4f288b2
Deprecate json_encode_dict and json_encode_list jinja filters
...
These should be replaced with "tojson".
2018-06-27 12:23:29 -05:00
Erik Johnson
3896e3468c
Use upstream tojson filter, if present
2018-06-27 12:23:29 -05:00
Erik Johnson
1499c6abcf
Implement tojson jinja filter for those using Jinja < 2.9
2018-06-27 12:23:29 -05:00
Megan Wilhite
5b8d55428e
Merge pull request #48323 from Ch3LL/update_version_doc_2018.3
...
Update release versions for the 2018.3 branch
2018-06-27 09:44:58 -04:00
Megan Wilhite
89dfcf3a4e
Merge pull request #48324 from Ch3LL/update_version_doc_2017.7
...
Update release versions for the 2017.7 branch
2018-06-27 09:44:21 -04:00
Megan Wilhite
7cf403e313
Merge pull request #48326 from Ch3LL/rn_remove_in_prog
...
Remove In Progress Warning for 2018.3.2 Release
2018-06-27 09:43:16 -04:00
Daniel Wallace
ece4c30aac
Merge pull request #48331 from rallytime/bp-48215
...
Back-port #48215 to 2017.7
2018-06-27 08:12:35 -05:00
Daniel Wallace
ab05e00d8c
Merge pull request #48332 from rallytime/bp-48321
...
Back-port #48321 to 2017.7
2018-06-27 08:12:14 -05:00
William Giokas
d72af6ab4e
Jenkins needs the / to get the directory
2018-06-26 19:45:14 -04:00
William Giokas
9d6ba3e247
Set jobs to pending when they come in
2018-06-26 19:43:53 -04:00
William Giokas
727d2b4ffe
Use proper creds with githubNotify
...
I also made it more generic for the distros.
2018-06-26 19:43:53 -04:00
