Commit Graph

38779 Commits

Author SHA1 Message Date
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
Mike Place
fec6b2716b Remove now-deprecated file.sed 2014-10-27 16:22:07 -06:00
Mike Place
86da58a8c6 Remove function that's now deprecated in augeas state 2014-10-27 16:20:46 -06:00
Mike Place
9d8ea35fff Remove unused and deprecated utlity function 2014-10-27 16:18:12 -06:00
Mike Place
3c38f49d33 Remove deprecated runas from at state 2014-10-27 16:14:29 -06:00
Mike Place
b67705e56d Remove deprecated runas from gem state 2014-10-27 16:12:40 -06:00
Mike Place
31c1949def Remove deprecated runas from git state 2014-10-27 16:11:11 -06:00
Mike Place
5c1b2c2b69 Remove deprecations in hg state 2014-10-27 16:08:22 -06:00
Mike Place
6fc78ab7b1 Remove deprecations from npm state 2014-10-27 16:07:32 -06:00
Mike Place
d7521fbfe6 Remove deprecated runas in postgre_database 2014-10-27 16:05:25 -06:00
Mike Place
3dd213f5c3 Remove runas from argspec due to deprecation 2014-10-27 16:02:59 -06:00
Mike Place
1dc23d6110 Remove runas from argspec because it is deprecated 2014-10-27 16:02:14 -06:00
Mike Place
97487d80f3 Remove runas argspec from rbenv 2014-10-27 16:00:54 -06:00
Mike Place
89c75c4881 Remove runas from argspec in pyenv 2014-10-27 16:00:00 -06:00
Mike Place
8a419f0efe Remove runas argspec from postgres_user 2014-10-27 15:58:52 -06:00
Mike Place
b9a17f60e4 Remove deprecations from postgres_group 2014-10-27 15:56:41 -06:00
Mike Place
a9df67fc22 Remove deprecations from postgres_user 2014-10-27 15:54:17 -06:00
Mike Place
23a159766a Remove deprecations in pyenv state 2014-10-27 15:52:44 -06:00
Mike Place
e304b12260 Remove deprecations from rbenv 2014-10-27 15:51:12 -06:00
Mike Place
b4047ea69f Remove deprecations from rvm state 2014-10-27 15:51:01 -06:00
Mike Place
c6d2af2234 Remove deprecated runas from supervisord 2014-10-27 15:47:04 -06:00
Mike Place
75c3b2f727 Remove runas from virtuenv_mod because it's deprecated now 2014-10-27 15:44:05 -06:00
Mike Place
27b7cdae90 Remove deprecation from zcbuildout 2014-10-27 15:41:23 -06:00
Joseph Hall
079db261af Merge pull request #16924 from holmboe/noop-if
Remove no-op if statement
2014-10-27 10:19:48 -06:00
Henrik Holmboe
f3d7590ee4 Remove no-op if statement 2014-10-27 12:14:27 +01:00
Erik Johnson
ed374a9225 Merge pull request #16922 from nerdling/patch-1
Update doc/topics/installation/osx.rst
2014-10-26 15:02:58 -06:00
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst
Unify instructions across package managers.
2014-10-26 16:20:13 -04:00
Pedro Algarvio
2b60e66c08 Merge pull request #16909 from techhat/sshkwargs
Rename kwargs back to ssh_kwargs
2014-10-25 18:49:48 +01:00
Joseph Hall
1bada41794 Rename kwargs back to ssh_kwargs 2014-10-25 10:20:48 -06:00
Joseph Hall
8140a50b22 Merge pull request #16908 from rallytime/develop
Merge forward
2014-10-25 10:13:09 -06:00
rallytime
22a4c09f84 Pylint fix 2014-10-25 09:28:23 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
2014-10-25 08:54:42 -06:00
Thomas S Hatch
e7311ba05e Merge pull request #16903 from techhat/backport16886
Backport #16886 to 2014.7
2014-10-24 21:50:57 -06:00
Joseph Hall
2e9d40fb23 Backport #16886 to 2014.7 2014-10-24 20:58:57 -06:00
Thomas S Hatch
c74cd88403 Merge pull request #16894 from rallytime/bp-16815
Backport #16815 to 2014.7
2014-10-24 18:01:32 -06:00
Thomas S Hatch
f3f388d4d4 Merge pull request #16897 from rallytime/bp-16877
Backport #16877 to 2014.7
2014-10-24 17:46:37 -06:00
Thomas S Hatch
eeb9c408f3 Merge pull request #16895 from rallytime/bp-16797
Backport #16797 to 2014.7
2014-10-24 17:29:15 -06:00
Thomas S Hatch
7bff44726a Merge pull request #16896 from thatch45/jacksontj-2014.7-config
Merge #16889 with fixes
2014-10-24 17:27:13 -06:00
Thomas S Hatch
841d9a8d24 Merge pull request #16893 from rallytime/bp-16813
Backport #16813 to 2014.7
2014-10-24 17:08:34 -06:00
Jason R. McNeil
08a7359daf Use the image id as name is not unique for DigitalOcean images.
Conflicts:
	salt/cloud/clouds/digital_ocean_v2.py
2014-10-24 16:56:00 -06:00
Thomas S Hatch
939191ae6e Merge pull request #16892 from rallytime/cloud_test_update
Change profile name for Digital Ocean cloud tests
2014-10-24 16:53:45 -06:00
Thomas S Hatch
a81898f0b1 Fix broken salt ssh extension mods dir 2014-10-24 16:45:45 -06:00
Thomas S Hatch
3c86949667 Merge branch '2014.7-config' of https://github.com/jacksontj/salt into jacksontj-2014.7-config 2014-10-24 16:45:18 -06:00
Thomas S Hatch
2e7fe19ee2 Merge pull request #16891 from rallytime/bp-16809
Backport #16809 to 2014.7
2014-10-24 16:39:04 -06:00
rallytime
429c17aef3 Pylint fix 2014-10-24 16:36:24 -06:00
Thomas S Hatch
ce28ee1b89 Merge pull request #16890 from rallytime/bp-16798
Backport #16798 to 2014.7
2014-10-24 16:35:09 -06:00
Mike Place
0492e84130 Catch error conditions in quota.get_mode
Closes #16381
2014-10-24 16:34:56 -06:00
Thomas S Hatch
e8738638f5 Merge pull request #16886 from techhat/filemap
Add file_map to salt.utils.cloud.bootstrap-enabled providers
2014-10-24 16:33:40 -06:00
Tanoti
6858ce751d Fixed invalid archive type error message, was reporting 'name' not 'archive_format' 2014-10-24 16:31:17 -06:00
Henrik Holmboe
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -06:00