Thomas Jackson
07de054b81
Correct tag name in loader tests
2015-02-06 14:26:30 -08:00
Thomas Jackson
504b60185c
Cleanup the py3 stuff, __globals__ is in both
2015-02-06 14:26:30 -08:00
Thomas Jackson
4e592f3aae
Add "disabled" support
...
this allows you to "blacklist" modules.
Addition to #20274
2015-02-06 14:26:30 -08:00
Thomas Jackson
88d274776d
Fix botched py3 compat change
2015-02-06 14:26:30 -08:00
Colton Myers
024938341e
Fix pylint
2015-02-06 15:25:15 -07:00
Colton Myers
1370fddfef
Yield ret immediately
2015-02-06 15:03:54 -07:00
Colton Myers
48c029efdb
Fix race condition in salt-ssh cleanup
...
Conflicts:
salt/client/ssh/__init__.py
2015-02-06 15:03:39 -07:00
jfindlay
3872ffb9ef
Merge pull request #20479 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-02-06 14:04:03 -07:00
jfindlay
6d689d1eea
Merge pull request #20470 from jacksontj/loader
...
Fix botched py3 compat change
2015-02-06 13:48:17 -07:00
Colton Myers
6e7df06e05
Remove code as instructed by @jfindlay
2015-02-06 13:13:30 -07:00
Colton Myers
af21033482
Merge pull request #20478 from basepi/merge-forward-develop2
...
Merge forward from 2015.2 to develop
2015-02-06 13:11:14 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
rallytime
dd413f495d
Move integration import after ensure_in_syspath call
2015-02-06 12:49:28 -07:00
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
Aaron Bell
530eba846d
get certs in tls module
2015-02-06 09:59:28 -08:00
Mike Place
54d92f86df
Use list instead
2015-02-06 10:55:01 -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
15b1a459ba
Merge pull request #20445 from whiteinge/doc-preseed-key-links
...
Add cross-refs to other ways to preseed minion keys
2015-02-06 10:34:37 -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
Gareth J. Greenaway
16e5a1e06e
Ability to specify the location where GPG related files are kept.
2015-02-06 09:28:58 -08: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
rallytime
e256943fd6
Pylint fix for develop
2015-02-06 10:04:52 -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
Thomas Jackson
3332ad02e0
Fix botched py3 compat change
2015-02-06 08:18:44 -08:00
Mike Place
c7c5b130ec
__virtual__ for cron module
2015-02-06 09:02:13 -07:00
Benjamin Drung
7cd688e649
Make log file group readable
...
The log file can only read and written by root. Making the log file group
readable allows users belonging to this group to read the salt log without
becoming root first.
2015-02-06 17:00:58 +01:00
Mike Place
c96b4725ae
Merge pull request #20465 from cachedout/safemode_config
...
Fix mismatched config value for auth_safemode
2015-02-06 08:51:40 -07:00
Mike Place
f9cb6cdeeb
Fix mismatched config value for auth_safemode
...
The actual default is false.
Closes #19945
2015-02-06 09:19:10 -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
