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
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
Pedro Algarvio
500513375e
Use salt's master clean_proc routine.
...
On Fedora 20, we hit an issue, at least, similar to #3618 .
While debugging it, I've found that the runtests process keeps eating
memory.
Using `clean_proc` has at least, allowed the runtests to finish without
triggering #3618 .
2014-04-18 07:52:40 +01:00
David Boucha
52b3fd3cb9
Merge pull request #11498 from Narcolapser/develop
...
Windows update module and state module
2014-04-17 19:00:44 -06:00
Seth House
ed70d94194
Merge pull request #12099 from UtahDave/develop
...
Add links to the md5 hash files
2014-04-17 18:42:44 -06:00
David Boucha
48cddf6a75
add note about comparing md5 hashes
2014-04-17 18:41:15 -06:00
David Boucha
1c840996b2
add links to the md5 hash files
2014-04-17 18:39:34 -06:00
Seth House
509d007da3
Added Mine example with arguments
...
Closes #11227
2014-04-17 17:58:34 -06:00
Seth House
2d818326fb
Merge pull request #12097 from whiteinge/docs-ga-opt-in
...
Set a variable if we're building for the live docs site or not
2014-04-17 17:49:47 -06:00
Seth House
9bb30cea10
Merge pull request #12096 from UtahDave/develop
...
change windows downloads to use https
2014-04-17 17:46:10 -06:00
David Boucha
5ab001a685
change windows downloads to use https
2014-04-17 17:42:33 -06:00
Seth House
fccd38b58b
Set a variable if we're building for the live docs site or not
...
This is useful to customize online / offline search and whether to
include things like Google Analytics.
Fixes #9875
2014-04-17 17:40:55 -06:00
Narcolapser
5f74c0fb9f
are in the enum of the users. this was used also to know when to
...
kick out of the while loop. This is one of those moments where you
wish that python had a "do while" feature. So i peiced something
together that allows res to start at 0 instead of 1. This solved the
problem of the first user being dropped from the list of users.
2014-04-18 00:37:00 +01:00
Narcolapser
b54277be7d
Figured it out. The varible 'res' is used to keep track of where you
...
are in the enum of the users. this was used also to know when to
kick out of the while loop. This is one of those moments where you
wish that python had a "do while" feature. So i peiced something
together that allows res to start at 0 instead of 1. This solved the
problem of the first user being dropped from the list of users.
2014-04-18 00:16:38 +01:00
Seth House
88041caa0b
Merge pull request #12091 from cachedout/1264
...
Write test for ownership of file.managed with makedirs=True
2014-04-17 16:05:26 -06:00
Mike Place
2ce051d6c3
Merge pull request #12092 from cachedout/win_file_pylint
...
Pylint for W1401
2014-04-17 15:45:59 -06:00
Mike Place
07e2920926
Pylint for W1401
2014-04-17 15:45:10 -06:00
Thomas S Hatch
bea8125853
Merge pull request #12076 from cachedout/12070
...
Display output from mine.get runner
2014-04-17 15:43:24 -06:00
Mike Place
f717aa6004
Write test for ownership of file.managed with makedirs=True
2014-04-17 15:36:08 -06:00
Colton Myers
4cd38ed338
Merge pull request #12088 from terminalmage/quickfix
...
Fix warn_until call
2014-04-17 15:19:59 -06:00
Joseph Hall
0a760d7d61
Merge pull request #12008 from garethgreenaway/develop
...
Adding the ability to invert rules in the iptables module and state.
2014-04-17 15:18:17 -06:00
Thomas S Hatch
57dbf4d8da
Merge branch '9379-win-symlinks' of git://github.com/slai/salt into slai-9379-win-symlinks
...
Conflicts:
salt/modules/win_file.py
2014-04-17 15:03:48 -06:00
Seth House
1610bda84b
Pulled Jinja docs back into the code
...
We were accumulating two versions of the docs since people update
docstrings as they hack but only one was getting rendered on the site.
Hopefully this is a happy middle-ground by spreading the docs around a
bit and pulling them in to a central location.
2014-04-17 14:24:15 -06:00
Erik Johnson
3abfc2c904
Fix warn_until call
...
This is pointing at a release using the old versioning scheme.
2014-04-17 15:11:08 -05:00
Mike Place
59e0f97ed2
Merge pull request #12087 from cachedout/event_pylint
...
Pylint for event.py
2014-04-17 14:02:43 -06:00
Mike Place
b581ff23b4
Pylint for event.py
2014-04-17 14:01:57 -06:00
Joseph Hall
51334f5302
Merge pull request #12084 from cachedout/12079
...
Fix broken eventlisten and small refactor.
2014-04-17 13:46:46 -06:00
Mike Place
e93d73d39c
Fix broken eventlisten and small refactor.
2014-04-17 13:30:53 -06:00
Samuel Smith
652d88ea15
Merge pull request #12083 from SmithSamuelM/sam_raet_37
...
Updated Salt to use new IoFlo naming convention
2014-04-17 12:59:41 -06:00
Samuel M Smith
307cf7844c
Updated Salt to use new IoFlo naming convention
2014-04-17 12:57:39 -06:00
Seth House
138cf6ff81
Merge branch 'doc-new-additions' into develop
2014-04-17 12:40:58 -06:00
Seth House
cb2a2385b6
Host of misc rST fixes
2014-04-17 12:37:04 -06:00
Pedro Algarvio
6cfb78c6ef
Merge pull request #12081 from s0undt3ch/develop
...
Provide a way to specify the VM's name prefix.
2014-04-17 19:22:41 +01:00
Seth House
14515c3c8b
Added generated templates for the new additions
2014-04-17 12:20:07 -06:00
Pedro Algarvio
6206175bea
Provide a way to specify the VM's name prefix.
2014-04-17 19:19:40 +01:00
Seth House
d2f057b0fd
Combed through all the module types to add recent additions to the docs
2014-04-17 12:16:26 -06:00
Erik Johnson
3545b4bbab
Fix test=True output for supervisord.running state
...
This commit properly identifies when no action needs to be taken and
returns True in those cases.
2014-04-17 12:55:42 -05:00
Mike Place
5a0dc4b4d0
Display output from mine.get runner
2014-04-17 10:17:52 -06:00
Joseph Hall
dff03061c4
Merge pull request #12075 from mtorromeo/fix/keystone-tenant
...
Fix adding tenant to keystone user with no previous tenant assigned
2014-04-17 09:19:27 -06:00
Mike Place
6cb3c75ae4
Merge pull request #12074 from FrimaStudio/issue_12073_enable_gpu_grains_validation
...
Fixed enable_gpu_grains option by validate the option before the lspci c...
2014-04-17 09:05:19 -06:00
Massimiliano Torromeo
c1642db1d0
Fix adding tenant to keystone user with no previous tenant assigned
2014-04-17 16:46:10 +02:00
evilNullPointer
c605704d58
Fixed enable_gpu_grains option by validate the option before the lspci check
2014-04-17 10:36:01 -04:00
Narcolapser
75d981bede
oh. this may be sticker than I think. It doesn't seem to be a problem directly in the function. some how it just isn't getting all the users from windows.
2014-04-17 15:07:22 +01:00
