Gareth J. Greenaway
0d4647c2dd
Removing unnecessary log.
2018-02-21 13:14:05 -08:00
Gareth J. Greenaway
2df1866cc1
Adding a internal reset function to scheduler. Calling reset between schedule tests to ensure schedule is empty and it is using defaults.
2018-02-21 13:00:19 -08:00
Nicole Thomas
1fcbbd1e02
Merge pull request #46136 from rallytime/bp-46115
...
Back-port #46115 to 2017.7
2018-02-21 14:17:22 -05:00
Nicole Thomas
fd0482b26b
Merge pull request #45458 from mchugh19/zabbix-inventory
...
Add Zabbix inventory support
2018-02-21 14:17:05 -05:00
Daniel Wallace
713374b7ab
If no pubkey is passed in openmode fail
...
If the pub entry in the load is empty, we should fail authentication in open
mode. This is usually caught elsewhere for the other modes, because we would
just write it to a file, but in this case, we only write it to a file if it
actually exists, and if it is different from disk_key, so we would catch all
other options when trying to load the public key.
Fixes #46085
2018-02-21 14:09:17 -05:00
twangboy
3f4c340e3c
Update log statement
2018-02-21 14:04:49 -05:00
twangboy
7cd81a5cb5
Change the Invalid Data Message
2018-02-21 14:04:49 -05:00
twangboy
86c075e6e9
Convert reg values to unicode for debug
2018-02-21 14:04:48 -05:00
Nicole Thomas
11e5e8eb86
Merge pull request #45911 from twangboy/win_fix_lgpo_unicode
...
LGPO Module: Convert reg values to unicode for debug
2018-02-21 14:02:16 -05:00
Nicole Thomas
524a6a72a0
Merge pull request #46123 from gtmanfred/2017.7
...
If no pubkey is passed in openmode fail
2018-02-21 14:01:46 -05:00
twangboy
bcde5cc625
Update log statement
2018-02-21 09:47:54 -07:00
twangboy
e9fa53d3b7
Change the Invalid Data Message
2018-02-21 09:47:53 -07:00
twangboy
c818d4b791
Convert reg values to unicode for debug
2018-02-21 09:47:52 -07:00
Daniel Wallace
53d969a152
mark orch test as flaky
2018-02-21 09:41:57 -07:00
Nicole Thomas
e48fa58012
Merge pull request #46131 from vutny/doc-formula-formatting
...
[DOC] Fix code-blocks for reStructuredText
2018-02-21 10:47:05 -05:00
Daniel Wallace
8d36730ef7
If no pubkey is passed in openmode fail
...
If the pub entry in the load is empty, we should fail authentication in open
mode. This is usually caught elsewhere for the other modes, because we would
just write it to a file, but in this case, we only write it to a file if it
actually exists, and if it is different from disk_key, so we would catch all
other options when trying to load the public key.
Fixes #46085
2018-02-21 08:38:30 -07:00
Volodymyr Samodid
0a481d707f
update digitalocean salt-cloud driver
...
fix #45837
2018-02-21 10:33:29 -05:00
Damon Atkins
99e7f6a7d3
update ec2 pillar arguments with better names
2018-02-22 02:25:36 +11:00
zr
57a60f62a3
fix kernel subpackages install bug
2018-02-21 10:25:12 -05:00
Nicole Thomas
e5d2f071b9
Merge pull request #46115 from samodid/fix_45837
...
update digitalocean salt-cloud driver
2018-02-21 10:23:05 -05:00
Nicole Thomas
6cea44ee95
Merge pull request #46118 from rallytime/bp-44603
...
Back-port #44603 to 2017.7
2018-02-21 10:21:41 -05:00
Nicole Thomas
a79d4f12a7
Merge pull request #46119 from rallytime/bp-46094
...
Back-port #46094 to oxygen.rc1
2018-02-21 10:18:58 -05:00
Nicole Thomas
1f31031adc
Merge pull request #46116 from rallytime/utils-paths
...
Update stringutils path in reg state to use new location
2018-02-21 10:05:43 -05:00
Nicole Thomas
0e63decaac
Merge pull request #46117 from Ch3LL/mac_ssh_schema
...
Add stringutils.to_str in test_roster_config_validate test
2018-02-21 09:57:44 -05:00
Nicole Thomas
a50bb41849
Merge pull request #46110 from isbm/isbm-iscsii-master-nonroot
...
IQN check for iSCSII crash on non-root Master
2018-02-21 09:56:53 -05:00
Nicole Thomas
1b01f5d3f8
Merge branch 'develop' into zabbix-inventory
2018-02-21 09:56:05 -05:00
Nicole Thomas
178eaab503
Merge pull request #46105 from DSRCorporation/bugs/M2Crypto_py3_unicode_fix
...
M2Crypto Py3 unicode fix
2018-02-21 09:30:33 -05:00
Denys Havrysh
d8fb051e44
[DOC] Fix code-blocks for reStructuredText
2018-02-21 15:37:57 +02:00
Reto Welti
872c44092e
[ #46028 ] strictly separate extension with and without classifier
2018-02-21 14:05:32 +01:00
Bo Maryniuk
1b75f98a91
Catch proper exception type
2018-02-21 13:11:44 +01:00
rallytime
6875e9bee8
Update release versions for the develop branch
2018-02-21 06:37:26 -05:00
rallytime
0ed338e643
Update release versions for the 2017.7 branch
2018-02-21 06:37:22 -05:00
rallytime
d2196b6df3
Update release versions for the 2016.11 branch
2018-02-21 06:37:18 -05:00
Nicole Thomas
16c382b55b
Merge pull request #46121 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-02-21 05:07:17 -05:00
Bo Maryniuk
5149cdbbd9
Fix unit test for py3
2018-02-21 10:53:20 +01:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions
...
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
2018-02-20 16:06:00 -07:00
Nicole Thomas
b92346645b
Merge pull request #46107 from amendlik/yumpkg-assumeyes
...
Add --assumeyes on YUM/DNF commands
2018-02-20 17:52:05 -05:00
Nicole Thomas
772636f67a
Merge pull request #46084 from garethgreenaway/oxygen_swap_to_datetime_objects
...
[oxygen] swap scheduler to use datetime objects
2018-02-20 17:51:26 -05:00
Nicole Thomas
49c1fc6faf
Merge pull request #46088 from rongzeng54/master
...
fix kernel subpackages install bug
2018-02-20 17:50:46 -05:00
Nicole Thomas
8f245ea62e
Merge pull request #46069 from rallytime/bp-46036
...
Back-port #46036 to oxygen.rc1
2018-02-20 17:50:17 -05:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-02-20 17:43:33 -05:00
gwiyeong
fa4270c53e
Fixes memory leak, saltclients should be cleaned after used.
2018-02-20 17:01:20 -05:00
gwiyeong
f063cdcae1
Adds set_close_callback function to removes stream instance after closed from a set streams.
2018-02-20 17:01:20 -05:00
Ollie Armstrong
2a2c23c66b
Fix acme state to correctly return on test
...
Previously, the acme.cert state would return that a change was pending
during a test run even in the case that the certificate would not have
been touched.
Changed the return value in this case so that it is not thought to
require a change.
This is reported in #40208 [0] and is also referenced in #42763 [1].
The issue #40208 looks to go on to recommend further changes beyond the
scope of this 'quick fix'.
[0] https://github.com/saltstack/salt/issues/40208#issuecomment-289637588
[1] https://github.com/saltstack/salt/issues/42763#issuecomment-345728031
2018-02-20 16:50:50 -05:00
Nicole Thomas
93dab45307
Merge pull request #46078 from rallytime/merge-oxygen
...
[oxygen] Merge forward from oxygen.rc1 to oxygen
2018-02-20 16:49:04 -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
93c389ee5e
Merge pull request #46112 from terminalmage/salt-jenkins-825
...
Fix failure to build docs in develop branch
2018-02-20 16:41:48 -05:00
Nicole Thomas
14fe423e0c
Merge pull request #46094 from kstreee/fix-memory-leak
...
Fix memory leak
2018-02-20 16:36:01 -05:00
Nicole Thomas
60ee64af40
Merge pull request #46029 from areaxx/develop
...
[#46028 ] do the version check with packaging AND classifier
2018-02-20 16:35:10 -05:00
Nicole Thomas
4b8cb89d27
Merge pull request #46114 from Ch3LL/mac_sysctl
...
Ensure new line is added to file in mac sysctl.present
2018-02-20 16:30:19 -05:00
