valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,619 Commits 24 Branches 182 Tags 341 MiB
bba019371a
Commit Graph

46619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
bba019371a Merge pull request #3 from jfindlay/locale_test_fix 
fix merge forward localemod tests
 2015-02-06 12:23:35 -07:00
Justin Findlay
b59a164717 fix merge forward localemod tests 2015-02-06 12:21:13 -07:00
Colton Myers
06e1a4f519 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2 
Conflicts:
	salt/client/mixins.py
	salt/loader.py
	salt/modules/localemod.py
	salt/modules/pillar.py
	salt/netapi/rest_cherrypy/app.py
	salt/pillar/__init__.py
	salt/states/mount.py
	salt/states/ssh_auth.py
 2015-02-06 12:09:01 -07:00
Joseph Hall
fc9f379e29 Merge pull request #20474 from djcrabhat/vsphere-sudo-deploy 
add sudo, sudo_password params to vsphere deploy to allow for non-root deploys
 2015-02-06 11:19:48 -07:00
Manoli Yiannakakis
bb916935f1 add sudo, sudo_password params to deploy to allow for non-root deploys 2015-02-06 09:37:47 -08:00
Thomas S Hatch
94b1316811 Merge pull request #20462 from thatch45/schedule_track 
Add minute granular start time
 2015-02-06 10:36:15 -07:00
Thomas S Hatch
3b1ff444d4 Merge pull request #20454 from scream3/develop 
RVM user-only installation is broken
 2015-02-06 10:35:32 -07:00
Thomas S Hatch
de71e5ffe0 Merge pull request #20443 from SmithSamuelM/sam_20150205 
Fixed bug and reverted some unnecessary changes where .six.itervalues was applied
 2015-02-06 10:33:32 -07:00
Thomas S Hatch
b40bfae919 Merge pull request #20440 from techhat/pageropts 
Ensure that creds is a dict (pagerduty)
 2015-02-06 10:31:21 -07:00
Thomas S Hatch
91e2b6db93 Merge pull request #20424 from techhat/thinrequests 
Remove requests from the thin tarball
 2015-02-06 10:30:47 -07:00
Thomas S Hatch
babebdaa9d Merge pull request #20400 from Azidburn/develop 
Fix for feature requests #3817 , #10258 in develop branch
 2015-02-06 10:29:45 -07:00
Thomas S Hatch
bf91b4f5c2 Merge pull request #20348 from analyzere/boto-skip-sync-option 
Add wait_for_sync option to route53 commands
 2015-02-06 10:24:53 -07:00
Mike Place
a34770b582 Merge pull request #20461 from cachedout/environ_isolate 
Reset env at end of test
 2015-02-06 10:15:19 -07:00
Mike Place
7dd8aef5b4 Typo 2015-02-06 10:46:31 -07:00
Mike Place
386a5a087c Merge pull request #20458 from cachedout/locale_suse 
Fix locale gen on suse
 2015-02-06 09:56:54 -07:00
Mike Place
c43438c674 Merge pull request #20452 from rudeb0t/develop 
Add IN_NO_LOOP incron mask type.
 2015-02-06 09:52:28 -07:00
Mike Place
0971e87782 Merge pull request #20455 from rupeshta/mod_random_unit_tests 
Mod random unit tests
 2015-02-06 09:49:45 -07:00
Mike Place
881a42a417 Merge pull request #20456 from rupeshta/monit_unit_tests 
Monit unit tests
 2015-02-06 09:48:56 -07:00
Mike Place
5a90fcfd45 Use cls attr 2015-02-06 09:47:26 -07:00
David Boucha
e1c09dd383 Merge pull request #20189 from Narcolapser/develop 
Windows Status Addendum
 2015-02-06 09:46:58 -07:00
Joseph Hall
744d30a5a6 Merge pull request #20463 from cachedout/issue_20384 
__virtual__ for cron module
 2015-02-06 09:38:46 -07:00
Mike Place
7630e1b6af Typos 2015-02-06 09:37:18 -07:00
Mike Place
8673a2a4f9 Fix typo 2015-02-06 09:27:53 -07:00
Mike Place
c7c5b130ec __virtual__ for cron module 2015-02-06 09:02:13 -07:00
Nicole Thomas
bd7409046a Merge pull request #20459 from rallytime/pylinting_develop 
Python 3 compatibility changes to make pylint happy
 2015-02-06 08:47:40 -07:00
Nicole Thomas
193a8138fd Merge pull request #20460 from rallytime/pylint_15_PR_cleanup 
Clean up some pylint on 2015.2
 2015-02-06 08:46:15 -07:00
Mike Place
8459819663 Reset env at end of test 2015-02-06 08:40:50 -07:00
Thomas S Hatch
9b70bfcf66 use utc time 2015-02-06 08:27:57 -07:00
Thomas S Hatch
f335d92d04 Add minute granular start time 2015-02-06 08:23:46 -07:00
Mike Place
d1b333b81f Fix locale gen on suse 2015-02-06 08:19:35 -07:00
rallytime
db612d0b81 Clean up some pylint on 2015.2 
This way PRs against 2015.2 will be a little happier
 2015-02-06 07:58:26 -07:00
Nicole Thomas
2aec7ddd24 Merge pull request #20434 from rallytime/bp-20427 
Backport #20427 to 2015.2
 2015-02-06 07:53:25 -07:00
rallytime
eaa879a64e Python 3 compat for tests/integration/loader/globals.py 2015-02-06 07:48:20 -07:00
rallytime
135ee5aafe Python 3 compat for mine_test.py and other testing import needs 2015-02-06 07:46:47 -07:00
rallytime
9fcec0418f Python 3 compat for salt/utils/lazy.py 2015-02-06 07:45:11 -07:00
rallytime
10e65878c1 Python 3 compat for salt/renderers/pyobjects.py 2015-02-06 07:43:15 -07:00
rallytime
530ca0172e Python 3 compat for salt/minion.py 2015-02-06 07:40:44 -07:00
Rupesh Tare
7b79128309 added some imports 2015-02-06 20:09:45 +05:30
rallytime
6b67e2d744 Python 3 compat for salt/loader.py 2015-02-06 07:38:05 -07:00
Rupesh Tare
6e0134ff92 added some imports 2015-02-06 20:07:43 +05:30
Rupesh Tare
3484419377 implementd unit test cases for monit module 2015-02-06 20:05:41 +05:30
Rupesh Tare
4c19fb6632 implementd unit test cases for mod_random module 2015-02-06 20:00:44 +05:30
rallytime
385792727b Moved tests/unit/loader.py to tests/integration/loader/loader.py 
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
 2015-02-06 07:28:43 -07:00
Andrii Krykunenko
3f7f50b1d6 Fix wrong check for rvm script existence 2015-02-06 12:15:06 +01:00
Nimrod A. Abing (on kohima)
28e62b57b9 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-06 16:09:03 +08:00
Mike Place
67473c5408 Merge pull request #20446 from jacksontj/loader 
Fix mis-naming from pylint cleanup
 2015-02-05 20:55:17 -07:00
Mike Place
3c8217528e Merge pull request #20444 from cachedout/async_client_outputter 
Use correct outputter in asynclient mixin
 2015-02-05 20:20:04 -07:00
Thomas Jackson
c8fdc9aaea Fix mis-naming from pylint cleanup 2015-02-05 19:01:37 -08:00
Mike Place
7f2f0e8ec3 Fix double-call (thanks @s0undt3ch) 2015-02-05 18:12:06 -07:00
Mike Place
1202c36137 Use correct outputter in asynclient mixin 
This is necessary for runners that specify an outputter in their allowed args
 2015-02-05 17:51:09 -07:00