Commit Graph

29336 Commits

Author SHA1 Message Date
Joseph Hall
2fe201590a Merge pull request #12132 from cachedout/12130
Try to create a file when appending if it doesn't exist.
2014-04-18 16:18:20 -06:00
Mike Place
7a3757b865 Try to create a file when appending if it doesn't exist. 2014-04-18 15:39:07 -06:00
Seth House
c87aa30c03 Misc rST fixes 2014-04-18 15:12:18 -06:00
Joseph Hall
dc9139f7cd Merge pull request #12129 from cachedout/6079
Disk mounting improvements and bug fixes
2014-04-18 14:26:57 -06:00
Mike Place
69f16d0dd8 Pylint 2014-04-18 14:15:39 -06:00
Mike Place
8e7e814432 Detect changed mount options and remount if necessary. 2014-04-18 13:57:16 -06:00
Joseph Hall
5ec068d2d7 Merge pull request #12126 from terminalmage/docs
more clarification/info on dunder objects
2014-04-18 13:45:48 -06:00
Erik Johnson
03c6db7b22 tweak wording 2014-04-18 14:43:18 -05:00
Erik Johnson
7ec19cd39f more clarification/info on dunder objects 2014-04-18 14:40:39 -05:00
Joseph Hall
6e398954ec Merge pull request #12124 from UtahDave/develop
Make sure queue exists before attempting to use it.
2014-04-18 13:14:58 -06:00
Mike Place
ba81f68f73 Rewrite docstring to be more clear. 2014-04-18 13:08:08 -06:00
Seth House
7c59da6dce Added training graphic 2014-04-18 13:02:23 -06:00
Thomas S Hatch
9f9e5c7c26 lint fix 2014-04-18 13:01:46 -06:00
Mike Place
ba2e0b7e06 Fix error where blkids do not return on values with spaces. 2014-04-18 12:58:49 -06:00
Joseph Hall
0b53288f4a Merge pull request #12123 from terminalmage/docs
More descriptive explanation of dunder objects in py renderer
2014-04-18 12:56:49 -06:00
Erik Johnson
1b08aa245a More descriptive explanation of dunder objects in py renderer 2014-04-18 13:55:23 -05:00
Seth House
a58f122d3d Added training links to the sidebar 2014-04-18 12:52:25 -06:00
Joseph Hall
a715136d14 Merge pull request #12118 from jacksontj/job_cache
Remove debug boolean
2014-04-18 12:48:29 -06:00
Joseph Hall
9df8c3cc63 Merge pull request #12122 from aboe76/develop
updated suse spec file to 2014.1.3
2014-04-18 12:42:48 -06:00
David Boucha
a0fb9c72fb check if queue exists 2014-04-18 12:38:46 -06:00
David Boucha
300bc84e3a Check for existence of queue first 2014-04-18 12:37:56 -06:00
Niels Abspoel
5cd37adb7d updated suse spec file to 2014.1.3 2014-04-18 20:35:33 +02:00
Thomas Jackson
6df3334f21 Update jobs.py
Remove one more boolean from local testing
2014-04-18 11:06:52 -07:00
Thomas Jackson
6ffed88912 Remove debug boolean 2014-04-18 10:48:50 -07:00
Thomas S Hatch
2cc3584ae0 Merge pull request #12117 from jacksontj/job_cache
Pylint cleanup
2014-04-18 11:39:45 -06:00
Thomas Jackson
959c3395dd Pylint cleanup 2014-04-18 10:38:36 -07:00
Samuel Smith
f367bf6c08 Merge pull request #12116 from SmithSamuelM/sam_raet_38
Minion join transaction (RAET version) now lasts forever until joined
2014-04-18 11:36:43 -06:00
Samuel M Smith
1ef4a21b5a Merge remote-tracking branch 'upstream/develop' into sam_raet_38 2014-04-18 11:35:09 -06:00
Samuel M Smith
9e3de158a4 minion join transaction will now last forever until joined 2014-04-18 11:34:16 -06:00
Thomas S Hatch
05721efb0b Merge pull request #12115 from cachedout/test_fix
Fix stacktrace
2014-04-18 11:28:38 -06:00
Mike Place
205a3ac9c4 Grrrr 2014-04-18 11:25:15 -06:00
Thomas S Hatch
b469b07a16 Merge pull request #12114 from cachedout/test_fix
Disable unreliable test.
2014-04-18 10:57:11 -06:00
Thomas S Hatch
fc0d6935ab lint 2014-04-18 10:55:39 -06:00
Mike Place
cb018eced0 Disable unreliable test. 2014-04-18 10:52:09 -06:00
Thomas S Hatch
e16affc5dd Lint 2014-04-18 10:46:11 -06:00
Thomas S Hatch
506e608ad4 Merge pull request #12107 from makinacorpus/c
cron: fix #11935
2014-04-18 10:31:36 -06:00
Thomas S Hatch
6a44b6703f Merge pull request #12104 from jacksontj/job_cache
Rework job runner to support ext_job_cache for all functions
2014-04-18 10:30:09 -06:00
Thomas S Hatch
3d605f6445 Merge pull request #12094 from UtahDave/sqs_additions
Add aws sqs receive and delete functions
2014-04-18 10:27:20 -06:00
Thomas S Hatch
ab373be840 Merge pull request #12089 from whiteinge/doc-jinja-inline
Pulled Jinja docs back into the code
2014-04-18 10:26:48 -06:00
Thomas S Hatch
7e24bba0e6 Merge pull request #12078 from terminalmage/issue11643
Fix test=True output for supervisord.running state
2014-04-18 10:26:03 -06:00
Thomas S Hatch
621b1f194d Merge pull request #12095 from Narcolapser/list_users
are in the enum of the users. this was used also to know when to
2014-04-18 10:24:43 -06:00
Joseph Hall
c7adb6ebf5 Merge pull request #12112 from ziirish/develop
add: new config option for virt module
2014-04-18 09:46:14 -06:00
Ziirish
6f6265bccb add: new config option for virt module in order to set proper libvirt connect string 2014-04-18 17:38:48 +02:00
Samuel Smith
cecbb4ec4f Merge pull request #12110 from SmithSamuelM/sam_raet_38
Added makedirs to mock in test
2014-04-18 09:18:45 -06:00
Samuel M Smith
9a21ebc72b Merge remote-tracking branch 'upstream/develop' into sam_raet_38 2014-04-18 09:17:35 -06:00
Samuel M Smith
97335ecd8d make dirs if not exist in test 2014-04-18 09:15:58 -06:00
Mathieu Le Marec - Pasquet
de66244e65 cron: fix test 2014-04-18 14:50:50 +02:00
Mathieu Le Marec - Pasquet
5ec87461c7 cron: pylint fixes 2014-04-18 12:38:54 +02:00
Mathieu Le Marec - Pasquet
9fa45ca022 cron: fix #11935 2014-04-18 09:14:21 +02:00
Pedro Algarvio
6e00b06c8d Merge pull request #12106 from s0undt3ch/develop
Use salt's master `clean_proc` routine.
2014-04-18 07:56:34 +01:00