Commit Graph

24747 Commits

Author SHA1 Message Date
David Boucha
7cfb3eada9 catch failing import 2014-01-10 16:24:05 -07:00
David Boucha
0cb731809e don't load salt cloud if it won't import 2014-01-10 16:18:35 -07:00
Pedro Algarvio
f687663690 Fix the comma placement 2014-01-10 22:53:44 +00:00
Pedro Algarvio
07667df90f The git url pillar value needs to be quoted 2014-01-10 22:47:52 +00:00
Pedro Algarvio
f5e4b9f52b When running "single-shot", it needs the params right away. 2014-01-10 21:31:36 +00:00
Thomas S Hatch
db9c722e56 Merge pull request #9690 from hulu/copyedit-cloud-config
copyedit doc/topics/cloud/config.rst
2014-01-10 12:59:20 -08:00
Joseph Hall
31a032635f Merge pull request #9691 from hulu/cloud-aws-copyedit
copyedit doc/topics/cloud/aws.rst
2014-01-10 12:57:15 -08:00
Chris Rebert
bbdcb81e9b copyedit doc/topics/cloud/aws.rst 2014-01-10 12:43:08 -08:00
Chris Rebert
de5d0174e4 copyedit doc/topics/cloud/config.rst 2014-01-10 12:26:40 -08:00
Pedro Algarvio
fab35cd00f Remove un-necessary pass 2014-01-10 19:39:37 +00:00
Joseph Hall
e5918abbd2 Merge pull request #9685 from abemusic/documentation/ec2-spot-instances-and-ebs-volumes
Adding pool size doc; updating aws doc to include spot instance and EBS ...
2014-01-10 11:34:47 -08:00
David Boucha
bc86f775b8 Merge pull request #9689 from UtahDave/develop
Add more Windows libraries to freezer
2014-01-10 11:29:58 -08:00
David Boucha
a7807a92d9 Add more Windows libraries to freezer 2014-01-10 12:27:40 -07:00
Pedro Algarvio
b0a73d8b8e We're using args not kwargs 2014-01-10 19:24:23 +00:00
Abe Music
0de31bdc50 Add example for wait_for_spot_interval_multiplier 2014-01-10 12:46:51 -06:00
Abe Music
b232dccdf7 Adding code example for pool size configuration 2014-01-10 12:38:02 -06:00
Pedro Algarvio
ba62367e90 Fix attribute name 2014-01-10 18:32:05 +00:00
Pedro Algarvio
583de5a2dd The env generated from PR's should be a separate step. 2014-01-10 18:29:01 +00:00
quanta
f799e9a594 archive state: make it work with bsdtar (for e.g: on the Mac OS X) 2014-01-11 01:28:51 +07:00
Abe Music
104d94cf7d Adding pool size doc; updating aws doc to include spot instance and EBS volume support 2014-01-10 12:16:51 -06:00
Pedro Algarvio
8f1df67857 Let's not require these for now. 2014-01-10 18:15:47 +00:00
Pedro Algarvio
5b27a9a5c3 Merge pull request #9680 from s0undt3ch/develop
Use the `__virtualname__` attribute
2014-01-10 10:03:02 -08:00
Pedro Algarvio
bd2c7413f7 Not strictly necessary now(at least on the 1st stage) 2014-01-10 18:02:09 +00:00
Pedro Algarvio
40490bd158 Use the __virtualname__ attribute 2014-01-10 17:44:32 +00:00
Pedro Algarvio
932a2ba8ab Split the env genertion into parts 2014-01-10 17:28:07 +00:00
Pedro Algarvio
ab8f758453 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-01-10 17:25:58 +00:00
Pedro Algarvio
eaf3a50725 Get more info about a PR.
Since the Jenkins PR plugin does now set it in the environ.
2014-01-10 17:24:55 +00:00
David Anderson
065eb65f73 Add ability to fetch cached mine data in cache.py runner module 2014-01-10 10:22:33 -07:00
Joseph Hall
884ade4e68 Merge pull request #9677 from abemusic/features/polling-interval-multiplier
Add EC2 error message to logging; Add interval multiplier to spot instan...
2014-01-10 09:13:47 -08:00
David Boucha
3de09eb644 Merge pull request #9678 from UtahDave/develop
add win32net to windows freezer includes
2014-01-10 09:13:03 -08:00
David Boucha
6eae8acfa4 add win32net to windows freezer includes 2014-01-10 10:12:04 -07:00
Abe Music
af042ebd8e Add EC2 error message to logging; Add interval multiplier to spot instance and wait_for_ip polling 2014-01-10 10:59:24 -06:00
Thomas S Hatch
1f44a702f6 Merge pull request #9675 from abemusic/features/cloud-configurable-pool-size
Adding optional cloud configuration for controlling multiprocessing pool...
2014-01-10 08:52:24 -08:00
Thomas S Hatch
7a303fede9 whitespace 2014-01-10 09:48:13 -07:00
Abe Music
dfa404c54b Adding optional cloud configuration for controlling multiprocessing pool size 2014-01-10 10:44:26 -06:00
Thomas S Hatch
1e9b4f69b1 Merge pull request #9674 from CSSCorp/develop
changes to __virtual__, default arguments and comments
2014-01-10 08:32:11 -08:00
Thomas S Hatch
7bf0dcfd44 Merge pull request #9672 from s0undt3ch/develop
Remove trailing white-space.
2014-01-10 08:31:29 -08:00
Thomas S Hatch
eefa1ab482 Merge pull request #9667 from mikn/develop
Adding in keyring support in the DDNS module and fixing the reverse records
2014-01-10 08:30:36 -08:00
Thomas S Hatch
59bdb5efcb Merge pull request #9666 from dmyerscough/develop
Fix #9520 State  can't handle multiple swap partitions
2014-01-10 08:29:27 -08:00
Akilesh
57b7bbe701 changes to __virtual__, default arguments and comments 2014-01-10 19:38:51 +05:30
Mikael Knutsson
92cf55b973 Now the reverse zones are being tried in the correct order and the full IP is being reversed for the PTR record. Fixes #9668 upstream. 2014-01-10 15:04:19 +01:00
Mikael Knutsson
6bf1504ead Adding in keyring support in the DDNS module. 2014-01-10 13:59:19 +01:00
Damian Myerscough
c8c6112426 Fix #9520 State can't handle multiple swap partitions 2014-01-10 12:31:24 +01:00
Pedro Algarvio
453d8e5d8e Remove trailing white-space. 2014-01-10 11:23:09 +00:00
Joseph Hall
0f11c026d7 Merge pull request #9662 from garethgreenaway/develop
Adding IPv6 support into the iptables module and state.
2014-01-09 19:00:45 -08:00
Gareth J. Greenaway
9c3c702040 Adding IPv6 support into the iptables module and state. Firewalls for IPv6 use ip6tables to manage it, the module has been updated to accept a new argument for each function named family. Family will default to ipv4 which will cause the module to use iptables specific commands and files, passes ipv6 for the family will cause the module to use ip6tables and friends. The state was also updated to accept the family option with a default of ipv6. 2014-01-09 16:47:18 -08:00
Thomas S Hatch
e320b140f0 Merge pull request #9655 from s0undt3ch/develop
`open()` -> `salt.utils.fopen()`
2014-01-09 15:58:35 -08:00
Thomas S Hatch
98f0d06f49 Merge pull request #9660 from mbarrien/ec2-dedicated
Support dedicated tenancy for EC2 cloud
2014-01-09 15:54:10 -08:00
Michael Barrientos
85a2550a9d Support dedicated tenancy for EC2 cloud 2014-01-09 14:51:50 -08:00
Michael Birtwell
9100506a64 Fix pkg/rpm/build.py when it's a release candidate
Uses version.py to generate the complete version string
2014-01-09 15:45:40 -07:00