Thomas S Hatch
cef8320a7a
Fix cmd_async to be just async
2013-11-14 12:56:41 -07:00
Thomas S Hatch
ab8cc9b5fa
Minor doc fix
2013-11-14 12:56:41 -07:00
Thomas S Hatch
70f2c03e58
Merge pull request #8528 from techhat/cloudapi
...
Adding full query and select query
2013-11-14 12:01:09 -08:00
Joseph Hall
eb65ece173
Adding full query and select query
2013-11-14 12:59:38 -07:00
Thomas S Hatch
6d78c0ebf9
Fix ref to any_auth method
2013-11-14 12:18:38 -07:00
Thomas S Hatch
91d23d026a
lint fixes for gnomedesktop
2013-11-14 12:08:36 -07:00
Thomas S Hatch
2731aadce6
Set default to an iterable for authorize backend detection
2013-11-14 12:02:46 -07:00
Pedro Algarvio
4bd60e2e21
Minor typo.
2013-11-14 18:38:05 +00:00
Pedro Algarvio
2a699bf4da
Merge pull request #8519 from emilisto/develop
...
pip state module requires name even if requirements file is specified
2013-11-14 10:32:38 -08:00
Pedro Algarvio
1d2873b6a2
Merge pull request #8526 from garethgreenaway/develop
...
Removing imports
2013-11-14 10:17:47 -08:00
Gareth J. Greenaway
db37efb8e5
Merge remote-tracking branch 'upstream/develop' into develop
2013-11-14 09:41:39 -08:00
Gareth J. Greenaway
291ca2b3c8
removing unneeded imports from gnomedesktop module.
2013-11-14 09:38:47 -08:00
Pedro Algarvio
9612e58498
Merge pull request #8525 from terminalmage/quickfix
...
Minor fix in ports state __virtual__ function
2013-11-14 09:34:01 -08:00
Seth House
2e3ddbf4c1
Updated bad link to Windows downloads in the salt-cloud docs
2013-11-14 09:57:14 -07:00
Erik Johnson
534e9ef4d6
Minor fix in ports state __virtual__ function
...
The if statement should have been checking to see if 'ports.install' is
in the __salt__ dict. As it was before this commit, the second half of
the if statement would always resolve to True.
2013-11-14 10:22:37 -06:00
Joseph Hall
0249d9d67f
Merge pull request #8523 from whiteinge/django-importlib-fix
...
Replaced Python 2.7-ism when importing Django model
2013-11-14 07:52:01 -08:00
Joseph Hall
f7d75bc12f
Merge pull request #8522 from ahale/develop
...
updated rackspace docs
2013-11-14 05:55:07 -08:00
ahale
5b426ca1cf
updated rackspace docs
2013-11-14 13:29:57 +00:00
Emil Stenqvist
f487d5568a
Fix for issue #8519
...
Also added a test that fails prior to the fix, illustrating the problem.
2013-11-14 14:26:35 +01:00
Joseph Hall
4292ad334e
Merge pull request #8518 from graingert/patch-1
...
don't fail for no files found Fixes #8517
2013-11-14 04:55:00 -08:00
Thomas Grainger
159f10b3d7
don't fail for no files found Fixes #8517
2013-11-14 12:54:01 +00:00
Joseph Hall
5894af3b60
Merge pull request #8507 from georgegoh/develop
...
When reading the map file, use Mako-specific classes only if they are imported
2013-11-14 04:35:01 -08:00
Pedro Algarvio
9e5ba8c45f
Another missing comma.
2013-11-14 08:22:42 +00:00
David Boucha
3c77860fc0
Merge pull request #8515 from UtahDave/fix_pylint
...
more pylint fixes
2013-11-14 00:22:29 -08:00
David Boucha
88aff3ef8a
more pylint fixes
2013-11-14 01:15:38 -07:00
Pedro Algarvio
a451232026
Merge pull request #8514 from UtahDave/fix_pylint
...
various pylint fixes
2013-11-14 00:05:51 -08:00
David Boucha
f0ce7c2d69
various pylint fixes
2013-11-14 01:03:54 -07:00
Pedro Algarvio
096c504700
Merge pull request #8513 from s0undt3ch/hotfix/windows-salt-cloud
...
Add some missing commas.
2013-11-14 00:00:41 -08:00
Pedro Algarvio
5e76d602ea
Add some missing commas.
2013-11-14 07:59:55 +00:00
David Boucha
38dc928f67
Merge pull request #8512 from s0undt3ch/hotfix/windows-salt-cloud
...
There are still some more script which should not be available on windows
2013-11-13 23:56:23 -08:00
Pedro Algarvio
62263be9c8
Man7 should be included.
2013-11-14 07:54:31 +00:00
Pedro Algarvio
344cb8f120
There are still some more script which should not be available on windows.
2013-11-14 07:52:28 +00:00
David Boucha
5627f4459b
Merge pull request #8510 from s0undt3ch/hotfix/windows-salt-cloud
...
Salt cloud should not be packaged to windows.
2013-11-13 23:32:01 -08:00
Pedro Algarvio
813185e6b7
Merge pull request #8511 from UtahDave/fix_pylint
...
bunch of pylint and stylistic changes
2013-11-13 23:31:38 -08:00
David Boucha
b2300aaf26
bunch of pylint and stylistic changes
2013-11-14 00:27:57 -07:00
Pedro Algarvio
20434a19a5
Append on the right key.
2013-11-14 07:25:46 +00:00
Pedro Algarvio
56ac7137fd
Salt cloud should not be packaged to windows.
2013-11-14 07:20:01 +00:00
Pedro Algarvio
826121e395
Merge pull request #8509 from UtahDave/kill_saltcloud
...
no salt cloud on Windows
2013-11-13 23:00:40 -08:00
David Boucha
a7693cda27
no salt cloud on Windows
2013-11-13 23:46:07 -07:00
Pedro Algarvio
27c035ecd5
Merge pull request #8508 from UtahDave/develop
...
psutil isn't in the stdlib
2013-11-13 22:45:43 -08:00
David Boucha
8ce17cdf94
psutil isn't in the stdlib
2013-11-13 23:43:29 -07:00
David Boucha
581585c888
Merge pull request #8506 from garethgreenaway/develop
...
cleanup of gnomedesktop support. fixed pylint issues. moved to using t...
2013-11-13 22:18:04 -08:00
Gareth J. Greenaway
7de7864ee9
moving pwd import into the try...except to avoid importerrors on windows.
2013-11-13 22:00:38 -08:00
Pedro Algarvio
928c4c202c
A little bit more information.
2013-11-14 05:56:37 +00:00
Pedro Algarvio
25c4f28d22
Update transifex configuration file with current sources.
2013-11-14 05:56:37 +00:00
George Goh
81b1587cae
When reading the map file, use Mako-specific classes only if they are
...
imported.
2013-11-14 13:53:28 +08:00
Gareth J. Greenaway
48d379d375
cleanup of gnomedesktop support. fixed pylint issues. moved to using the salt cmd module instead of attempting to use python functions. removed all eval calls in favor of using locals().
2013-11-13 21:38:07 -08:00
Seth House
312b3bd73a
Replaced Python 2.7-ism when importing Django model
2013-11-13 19:32:39 -07:00
Erik Johnson
eec251630c
Merge pull request #8503 from s0undt3ch/develop
...
Jinja2 fixes
2013-11-13 17:51:26 -08:00
Pedro Algarvio
8ba59ea6c6
Adapt the tests to the latest Jinja2 template changes.
2013-11-14 01:21:57 +00:00
