Commit Graph

34141 Commits

Author SHA1 Message Date
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
rallytime
2c61c23e2a Deprecated OutputOptionsWithTextMixIn class from salt/utils/parsers.py 2014-07-16 12:36:31 -06:00
rallytime
1ef7052593 Deprecate memoize function from salt/utils/__init__.py 2014-07-16 12:32:15 -06:00
Colton Myers
11bfbd7a85 Merge pull request #14272 from rallytime/deprecate_check_dns
Deprecate check_dns
2014-07-16 11:44:32 -06:00
Joseph Hall
a39ac5296e Merge pull request #14278 from rallytime/pylint_fix
Fix pylint errors
2014-07-16 10:05:20 -06:00
rallytime
d95281c876 Fix pylint errors 2014-07-16 10:02:26 -06:00
Colton Myers
73acf47805 Merge branch '2014.7' into develop 2014-07-16 09:31:58 -06:00
Pedro Algarvio
b504f90295 Merge pull request #14271 from rallytime/deprecate_no_site_packages
Remove remaining references and tests to no_site_packages
2014-07-16 14:05:41 +01:00
rallytime
dfb8894e6a Remove unused imports 2014-07-16 06:41:28 -06:00
rallytime
26ab89e8ac Add deprecated check_dns notice to release notes 2014-07-16 06:29:14 -06:00
rallytime
6733f45924 Removed deprecated references to check_dns 2014-07-16 06:26:08 -06:00
rallytime
1c3737a883 Remove remaining references and tests to no_site_packages 2014-07-16 06:00:08 -06:00
Erik Johnson
c213bf8398 Merge pull request #14259 from rallytime/remove_dep_warnings
Removed no_site_packages as it has been deprecated
2014-07-15 20:15:31 -05:00
Pedro Algarvio
e0fc7ad2ee Merge pull request #14264 from rallytime/helium_to_num
Change "Helium" to 2014.7.0 for all versionadded sections
2014-07-16 02:15:13 +01:00
Samuel Smith
19f1cc6304 Merge pull request #14265 from SmithSamuelM/sam_raet_51
Fixed RaetKey.check_minion_cache to work with latest Road Keep files Added test
2014-07-15 19:12:36 -06:00
Samuel M Smith
1393a4b74e Fixed RaetKey.check_minion_cache to work with latest Road Keep files
Added test
2014-07-15 19:10:33 -06:00
rallytime
2268b0c654 Changed versionadded for modules 2014-07-15 18:43:24 -06:00
rallytime
e748efe13a Changed versionadded for client, fileserver, netapi, and pillar files 2014-07-15 18:26:04 -06:00
rallytime
4d329296b0 Remove unused import 2014-07-15 18:15:58 -06:00
Samuel M Smith
4f834c5cf8 Merge remote-tracking branch 'upstream/develop' into sam_raet_51 2014-07-15 17:42:22 -06:00
rallytime
534f3df900 Remove test for no_site_packages deprecation 2014-07-15 17:28:40 -06:00
rallytime
d4a322255f Changed versionadded in states 2014-07-15 17:24:44 -06:00
rallytime
ec963ac596 Change versionadded in runners, renderers, queues, utils 2014-07-15 17:12:19 -06:00
rallytime
af64d073da Change Helium to 2014.7.0 in cloud files 2014-07-15 17:05:22 -06:00
Samuel M Smith
f463945411 Added support for raet new store remotes by name feature 2014-07-15 17:04:32 -06:00
rallytime
8dcedf684d Change more affected docs from Helium to 2014.7.0 2014-07-15 17:02:19 -06:00
rallytime
a8cd830d52 Change "Helium" to 2014.7.0 in affected docs 2014-07-15 16:53:29 -06:00
rallytime
b1acf66703 Removed no_site_packages as it has been deprecated 2014-07-15 16:34:52 -06:00
Colton Myers
146930e021 Bump version to 2014.7.0 2014-07-15 15:41:19 -06:00
Nicole Thomas
6254216462 Merge pull request #14254 from rallytime/whitespace
Remove trailing whitespace
2014-07-15 15:12:43 -06:00
rallytime
d761254782 Remove trailing whitespace 2014-07-15 15:12:07 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
Thomas S Hatch
b9421f7c8d Allow raet libs to safely import salt.master 2014-07-15 15:04:10 -06:00
Thomas S Hatch
aa9a400ff2 Merge pull request #14198 from mgwilliams/lxc-keep-http-proxy
modules.lxc: keep http proxy for bootstrap
2014-07-15 15:02:13 -06:00
Mike Place
6b572eaa4b Merge pull request #14253 from pass-by-value/matcher_test_raet_compat
Matcher test raet compat
2014-07-15 14:53:57 -06:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Nicole Thomas
6d62f9196e Merge pull request #14251 from rallytime/remove_mixed_case
Don't load module if zypp is not present
2014-07-15 14:44:23 -06:00
rallytime
ef02abbdfc Don't load module if zypp is not present 2014-07-15 14:41:04 -06:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Thomas S Hatch
16bf7aabc9 Set the no refresh value in another catch point 2014-07-15 14:19:44 -06:00
Colton Myers
7a4e7204c8 Merge pull request #14248 from basepi/zypperfix14158
Don't use dict comprehensions in Python 2.6, Refs #14158
2014-07-15 14:03:58 -06:00
Colton Myers
a6759a33ad Don't use dict comprehensions in Python 2.6, Refs #14158 2014-07-15 14:02:44 -06:00
Colton Myers
fddf7fba07 Merge pull request #14247 from basepi/returnret14158
Return ret, Fixes 04c685ee48, Refs #14158
2014-07-15 13:17:22 -06:00
Colton Myers
d675d49e06 Return ret, Fixes 04c685ee48, Refs #14158 2014-07-15 13:16:51 -06:00
Thomas S Hatch
04c685ee48 Fix issue in dict comprehensition from #14158 2014-07-15 13:12:28 -06:00
Nicole Thomas
6a5f00c3ce Merge pull request #14244 from rallytime/fix_cache_tests
Change python asserts to unittest asserts
2014-07-15 13:10:19 -06:00
Thomas S Hatch
739ae438eb Merge pull request #14158 from rominf/module-zypper-repo
Add repo managing functionality to the zypper module
2014-07-15 12:25:46 -06:00
Thomas S Hatch
da8612ddcc Merge pull request #14243 from cachedout/masterswarm
Refactor into base swarm and master/minion swarm
2014-07-15 12:22:46 -06:00
rallytime
7bea8f5cb6 Change python asserts to unittest asserts 2014-07-15 11:56:50 -06:00
Mike Place
200ef6b642 Refactor into base swarm and master/minion swarm 2014-07-15 11:31:07 -06:00