valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,163 Commits 24 Branches 182 Tags 341 MiB
c10be40fc2
Commit Graph

73163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e45aa55d79 Merge pull request #35679 from twangboy/change.vcredist.version.2016.3 
Revert to vcredist 12 (2013)
 2016-08-23 17:05:40 +09:00
Denys Havrysh
78d16a8057 [BACKPORT] Fix empty fun_agrs field in Reactor generated events 2016-08-23 11:02:23 +03:00
Mike Place
a44b09e4d6 Merge pull request #35659 from vutny/fix-reactor-event-fun_agrs 
Fix empty `fun_agrs` field in Reactor generated events
 2016-08-23 16:41:13 +09:00
Mike Place
090e03fefc Merge pull request #35667 from komljen/develop 
When configuring master using salt cloud set 'hash_type: sha256' as a defau…
 2016-08-23 16:33:58 +09:00
Mike Place
9a3c1285a5 Merge pull request #35671 from sjorge/solaris-status.uptime 
status.uptime falls back to using uptime binary without /proc/uptime
 2016-08-23 16:24:00 +09:00
Mike Place
5593c1f349 Merge pull request #35672 from thatch45/ssh_scan 
Add salt-ssh option to default config
 2016-08-23 16:23:27 +09:00
Mike Place
9602a977c3 Merge pull request #35676 from rallytime/fixup-unit-tests 
Fixup unit tests errors that are not registering as failures
 2016-08-23 16:19:17 +09:00
Mike Place
7ed527ebe6 Merge pull request #35677 from rallytime/htpasswd_deprecation 
Remove htpasswd unit test for deprecated function that doesn't test anything
 2016-08-23 16:18:43 +09:00
Mike Place
aee5b62542 Merge pull request #35680 from terminalmage/issue35630 
Don't use six.text_type() in salt.utils.gitfs
 2016-08-23 16:17:00 +09:00
Mike Place
72897b8174 Merge pull request #35604 from twangboy/fix.postgres 
Remove debug line from postgres dunder virtual
 2016-08-23 13:30:51 +09:00
Erik Johnson
d76659a63a Don't use six.text_type() in salt.utils.gitfs 
For Python 2, Pygit2 (as well as others) store unicode strings as bytes
(e.g. ``'\xd0\x94'``), not as unicode strings. This can result in a
``UnicodeDecodeError`` being raised when ``os.path.join()`` is invoked
and Python attempts to decode the bytestring.

This commit fixes the issue by using ``str()`` to force config values to
be strings, rather than ``six.text_type()``.

Resolves #35630.
 2016-08-22 20:21:32 -05:00
twangboy
3d6d473d48 Revert to vcredist 12 (2013) 2016-08-22 17:57:14 -06:00
twangboy
10af191a4d Revert to vcredist 12 (2013) 2016-08-22 17:38:50 -06:00
rallytime
b5e5eeecd0 Remove htpasswd unit test for deprecated function that doesn't test anything 2016-08-22 17:14:07 -06:00
Thomas S Hatch
fa14a0207e Merge pull request #35675 from thatch45/name_docker 
Add the name to the created docker instance
 2016-08-22 16:47:12 -06:00
Thomas S Hatch
70e1fc39e2 Add the name tot he created instance 2016-08-22 16:12:40 -06:00
rallytime
49798ee301 Remove every.weeks reference: not available in relativedelta 2016-08-22 16:07:36 -06:00
rallytime
e14c930a74 Fixup errors in pillar consul unittests 2016-08-22 15:35:12 -06:00
Thomas S Hatch
b1b622e174 Add salt-ssh option to default config 2016-08-22 15:25:04 -06:00
Jorge Schrauwen
6a049e142a status.uptime falls back to using uptime binary on systems lacking /proc/uptime like Solaris, OpenBSD,... 2016-08-22 22:39:45 +02:00
Mike Place
44cbfbbecc Revert "The .message attr has been deprecated. Remove check for it." (#35669) 2016-08-22 14:09:48 -06:00
Nicole Thomas
74678923b8 Fixup doc formatting for the sqs_events engine (#35663) 
Fixes #35509
 2016-08-22 13:04:33 -06:00
Nicole Thomas
9fe0972761 Merge pull request #35662 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-22 13:03:43 -06:00
Justin Anderson
64974c89d9 Backport #35627 to 2016.3 (#35661) 
* This test was doing all sorts of things, raging from simply failing
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney

* Better method to skip test. This way we can track it.
 2016-08-22 13:03:24 -06:00
twangboy
c2fe3cd56c Capitalize Windows 2016-08-22 10:51:13 -06:00
twangboy
6b8bb5c2b3 Add init grain for mac and windows 2016-08-22 10:45:12 -06:00
Alen Komljen
65df35f95c When configuring master using salt cloud set hash_type=256 as a default value 2016-08-22 18:40:36 +02:00
Mike Place
513bca01c0 Clean up possible errors in the libcloud module (#35658) 2016-08-22 09:33:54 -06:00
twangboy
1008193aef Remove log line 2016-08-22 09:29:48 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
a66912f96e Merge pull request #35657 from cachedout/check_attr_in_test_utils 
Check for attr before attempting to add in salt.tests.utils
 2016-08-22 23:50:06 +09:00
Mike Place
845f2ba397 Merge pull request #35654 from cachedout/remove_deprecated_attr 
The .message attr has been deprecated. Remove check for it.
 2016-08-22 23:49:30 +09:00
Mike Place
c9451699be Merge pull request #35656 from cachedout/mock_sys_exit 
Mock sys.exit in salt.utils.extend
 2016-08-22 23:49:03 +09:00
Mike Place
a76db77d7a Lint 2016-08-22 23:48:38 +09:00
Mike Place
2593963f45 Check for attr before attempting to add in salt.tests.utils 2016-08-22 22:13:29 +09:00
Denys Havrysh
242cee5db8 Fix empty fun_agrs field in Reactor generated events 2016-08-22 15:42:33 +03:00
Mike Place
0dc7348f1d Mock sys.exit in salt.utils.extend 
Best not to push an exit into the test suite :]
 2016-08-22 21:37:40 +09:00
Mike Place
193024d615 The .message attr has been deprecated. Remove check for it. 2016-08-22 21:25:39 +09:00
Mike Place
187e04e109 Merge pull request #35653 from cachedout/set_computer_desc_retcode 
Switch to retcode evaluation for set_computer_desc
 2016-08-22 20:54:22 +09:00
Mike Place
6e1dcb94ec Account for differences in output 2016-08-22 20:54:03 +09:00
Mike Place
ddf9ed9da6 Switch to retcode evaluation for set_computer_desc 
Attempt to fix failing test. Do not merge unless integration.modules.system tests all pass.
 2016-08-22 19:21:04 +09:00
Mike Place
0ff2c27fc9 Merge pull request #35652 from cachedout/fix_tornado_setup_error 
Try/except the setup call in tornado test as a workaround pending sal…
 2016-08-22 19:09:40 +09:00
Mike Place
7fc803b4bd Try/except the setup call in tornado test as a workaround pending salt-testing release 2016-08-22 19:08:40 +09:00
Mike Place
a635c0954c Merge pull request #35648 from cachedout/test_wheel_test_fix 
Test a fix for the wheel test [WIP]
 2016-08-22 19:00:49 +09:00
Mike Place
2708fbc6d2 Lint 2016-08-22 19:00:19 +09:00
sun
79603ca410 just fix salt-syndic's log_level not consistent with salt-master​ 2016-08-22 17:24:19 +08:00
Mike Place
19b77442ee Test a fix for the wheel test 
I think that what is happening here is that we're using stale grains from a previous test. This should hopefully refresh them and allow this test to succeed.
 2016-08-22 17:13:16 +09:00
Mike Place
14612e9a9a Merge pull request #35647 from cachedout/remove_more_decorators 
Switch to using skipIf instead of a custom decorator
 2016-08-22 16:37:39 +09:00
Mike Place
5b75786208 Switch to using skipIf instead of a custom decorator 2016-08-22 16:36:51 +09:00