Commit Graph

31597 Commits

Author SHA1 Message Date
Joseph Lorenzini
b4e6d3b687 Merge remote-tracking branch 'salt/develop' into develop 2014-06-06 13:07:29 -05:00
Joseph Lorenzini
07e6c2ad5c removed tab characters from topic 2014-06-06 13:05:40 -05:00
Thomas S Hatch
bb5b50faa7 load the modules in the postinitio 2014-06-06 11:03:56 -06:00
Thomas S Hatch
9f66b678c9 run load_modules before any setup 2014-06-06 11:03:09 -06:00
Erik Johnson
b170c9b478 Fix to_reinstall
Remove parenthesis. This is a variable, not a function call.
2014-06-06 10:35:20 -05:00
Erik Johnson
2aa20b1406 Merge branch 'downgrade' into develop 2014-06-06 10:33:28 -05:00
Erik Johnson
e80e211a53 Merge branch 'yumpkg.install-downgrade-from-source' of https://github.com/jond64/salt into downgrade 2014-06-06 10:32:56 -05:00
Thomas S Hatch
6c31e33fe1 Merge pull request #13292 from crook/develop
fix #13291
2014-06-06 09:21:57 -06:00
Thomas S Hatch
65bfb9a7b6 Merge pull request #13278 from whiteinge/salt-async-runner-reactor
Execute runner functions asynchronously via the Reactor
2014-06-06 09:17:26 -06:00
Thomas S Hatch
5bd00c9dab Merge pull request #13287 from s0undt3ch/hotfix/lint
Lint Fixes
2014-06-06 09:13:38 -06:00
Thomas S Hatch
6dfbeb3a09 Merge pull request #13155 from jacksontj/conserve_channels
Conserve channels
2014-06-06 09:11:38 -06:00
Mike Place
dcbd8927be Merge pull request #13286 from s0undt3ch/develop
Fix typo
2014-06-06 09:08:57 -06:00
Thomas S Hatch
2492a1fca0 Merge pull request #13273 from garethgreenaway/control_scheudle
Updates to managing schedule code
2014-06-06 09:03:09 -06:00
Ray Chen
a1d939d402 fix #13291 2014-06-06 21:51:05 +08:00
Pedro Algarvio
e1ad39e8b1 Merge pull request #13288 from s0undt3ch/hotfix/jenkins
Hotfix/jenkins
2014-06-06 12:26:24 +01:00
Pedro Algarvio
e02a931894 Print stderr 2014-06-06 12:25:01 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
4146a0af1a Start ignoring PEP8 E129 and E131
* PEP8 E129: visually indented line with same indent as next logical line
* PEP8 E131: unaligned for hanging indent
2014-06-06 11:43:34 +01:00
Pedro Algarvio
01a48b6b5b Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:37:16 +01:00
Pedro Algarvio
c75fe971af Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:36:55 +01:00
Pedro Algarvio
e273da01c8 Fix PEP8 E714 - test for object identity should be "is not" 2014-06-06 11:36:32 +01:00
Pedro Algarvio
bb5d98568c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:33:50 +01:00
Pedro Algarvio
9478fb0d27 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:33:31 +01:00
Pedro Algarvio
99dff86c42 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:33:03 +01:00
Pedro Algarvio
d37a05d305 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:32:43 +01:00
Pedro Algarvio
0180ca09be Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:30:26 +01:00
Pedro Algarvio
e03226c67b Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:26 +01:00
Pedro Algarvio
d1a8e772da Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:27:01 +01:00
Pedro Algarvio
c6aa49c325 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:26:40 +01:00
Pedro Algarvio
05e5b19584 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:25:46 +01:00
Pedro Algarvio
3393be722c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:25:32 +01:00
Pedro Algarvio
70df7e10da Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:25:10 +01:00
Pedro Algarvio
74f1455cb7 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:24:45 +01:00
Pedro Algarvio
99086b4544 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:24:28 +01:00
Pedro Algarvio
a1b3b8cdc9 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:24:12 +01:00
Pedro Algarvio
371d9b0e58 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:23:55 +01:00
Pedro Algarvio
9c6c9e16be Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:23:08 +01:00
Pedro Algarvio
e12c310494 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:22:51 +01:00
Pedro Algarvio
1ba0060108 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:22:35 +01:00
Pedro Algarvio
1cbe3de2a2 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:22:20 +01:00
Pedro Algarvio
036aaf705c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:22:04 +01:00
Pedro Algarvio
dc027ee367 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:21:43 +01:00
Pedro Algarvio
a8e93b2213 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:21:27 +01:00
Pedro Algarvio
5eea0f6208 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:21:15 +01:00
Pedro Algarvio
02e8b01288 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:20:55 +01:00
Pedro Algarvio
00660a2405 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:20:16 +01:00
Pedro Algarvio
5638351d6c Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 11:20:00 +01:00
Pedro Algarvio
0db35982f2 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:50:18 +01:00
Pedro Algarvio
aa1ce6bdf9 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:49:49 +01:00
Pedro Algarvio
47ba2ded61 Fix PEP8 E713 - test for membership should be "not in" 2014-06-06 10:49:20 +01:00