Gareth J. Greenaway
ab0ee5539a
fixing lint issues.
2014-04-16 12:27:40 -07:00
Gareth J. Greenaway
f1b9c0eb18
removing unused logging import.
2014-04-16 12:13:28 -07:00
Gareth J. Greenaway
721f2da17d
Adding the ability to invert rules in the iptables module and state. The rules can be inverted by placing a ! or the word not before the contents of the kwarg argument in either the module call from the CLI or the state file.
...
Adding a re.compile for the pattern used in the re.sub since it is used often.
2014-04-16 12:13:27 -07:00
Thomas S Hatch
c4ac4754ee
Merge pull request #12038 from ticosax/add-support-multi-docker-engine
...
Since docker is using multiple driver extend its attach support.
2014-04-16 12:28:00 -06:00
Thomas S Hatch
a733cd1bae
Merge pull request #12036 from southquist/improved-softwareupdate
...
new download functions and other improvements
2014-04-16 12:25:30 -06:00
Thomas S Hatch
fefcfe9116
Merge pull request #12035 from jeroennijhof/develop
...
Add LDAP uri option and fix deficiencies
2014-04-16 12:24:07 -06:00
Thomas S Hatch
e1af647e5b
Merge pull request #12026 from iquaba/show-jid
...
--show-jid
2014-04-16 12:23:24 -06:00
Thomas S Hatch
241725e01f
Merge pull request #12019 from terminalmage/issue11907
...
Fix os grains for OpenSolaris/OpenIndiana Development
2014-04-16 12:22:30 -06:00
Thomas S Hatch
a643605d4d
Merge pull request #12014 from terminalmage/netbsd-syspaths
...
Set proper fallback CONFIG_DIR for NetBSD
2014-04-16 12:20:22 -06:00
Thomas S Hatch
e51b1c81e7
Merge pull request #12009 from fictivekin/allow-multiple-git-ids
...
Allow multiple identities for git
2014-04-16 12:19:56 -06:00
Joseph Hall
f10584856d
Merge pull request #12041 from techhat/libcloud
...
Remove libcloud as a hard dep for salt-cloud
2014-04-16 11:11:01 -06:00
Joseph Hall
2feab37658
Merge pull request #12040 from JustinHead/develop
...
Use cloud profile to determine key on delete
2014-04-16 10:54:30 -06:00
Joseph Hall
3f623fee26
Removing unused import
2014-04-16 10:45:29 -06:00
Thomas S Hatch
c112a97fe2
Only import zmq if we need to
2014-04-16 10:11:43 -06:00
Nicolas Delaby
3fb905574b
Since docker is using multiple driver extend its attach support.
...
Add support for attaching processes to a container driven by libcontainer.
lxc is still supported.
2014-04-16 18:11:37 +02:00
Joseph Hall
a82b2a3ea3
Remove libcloud as a hard dep for salt-cloud
2014-04-16 09:58:04 -06:00
Thomas S Hatch
07a073034c
Merge pull request #12005 from st0ne-dot-at/pillar_show
...
added runner pillar.show_pillar
2014-04-16 09:52:19 -06:00
Thomas S Hatch
23c441044c
Merge pull request #12004 from ticosax/fix-variable-scope
...
Fix variable definition in wrong scope
2014-04-16 09:51:24 -06:00
Justin Head
8b58c58635
Find key file via profile config on destroy the same way it is found on create.
2014-04-16 10:49:04 -05:00
JustinHead
cd9e83a6b4
Merge pull request #1 from saltstack/develop
...
Pull in latest upstream.
2014-04-16 10:45:25 -05:00
C. R. Oldham
c30981e8d2
Merge pull request #12037 from techhat/issue12002
...
Allow {set,get,del}_tags to work on all resources
2014-04-16 09:06:47 -06:00
Joseph Hall
acc98cbe62
Update AWS docs for new tagging functionality
2014-04-16 08:49:19 -06:00
Joseph Hall
981fa0b79f
Clarify docstrings for {get,del}_tags
2014-04-16 08:46:15 -06:00
Joseph Hall
c8c3b28bf0
Allow {set,get,del}_tags to work on all resources
2014-04-16 08:42:36 -06:00
Sebastian Soderqvist
7771ebb232
fixed pylint errors
2014-04-16 14:52:36 +02:00
Sebastian Soderqvist
dcd02084ce
new download functions and other improvements
2014-04-16 14:28:42 +02:00
Jeroen Nijhof
fe0a87c269
Fixed pylint C0326 issue
2014-04-16 13:27:13 +02:00
Jeroen Nijhof
b81d61bd03
Add LDAP uri option and fix deficiencies
2014-04-16 13:13:05 +02:00
Joseph Hall
7aa7cd9944
Merge pull request #12010 from rallytime/documentation_change
...
Documentation for returner config values pulled from minions
2014-04-15 19:19:36 -06:00
Joseph Hall
6237bf078f
Merge pull request #12028 from s0undt3ch/hotfix/bootstrap-script
...
Update to latest bootstrap script
2014-04-15 19:07:48 -06:00
Pedro Algarvio
9cdc0d5966
The script can be executable.
2014-04-16 01:23:55 +01:00
Pedro Algarvio
ed91be4ad7
Update to latest bootstrap-script.sh, v2014.04.16
2014-04-16 01:22:44 +01:00
Seth House
bcb66f160f
Add Sphinx extension to generate an index for short-URLs
2014-04-15 18:01:31 -06:00
iquaba
4e4319bf08
Simple pyline whitespace fix
2014-04-15 18:27:30 -05:00
Joseph Hall
b4f9e0f85b
Merge pull request #12021 from lyft/split-iam-out-of-s3
...
Move IAM credential fetching out of the s3 util.
2014-04-15 17:25:25 -06:00
iquaba
4654573b9e
Adds show_jid option to master config
2014-04-15 18:17:11 -05:00
iquaba
764185e8e5
Removes broken -sj short option
2014-04-15 18:06:44 -05:00
iquaba
6645405021
Adds -sj as shortened version of --show-jid
2014-04-15 17:52:20 -05:00
iquaba
b852704085
Adds --show-jid to print the jid without the additional output of --verbose
2014-04-15 17:44:09 -05:00
Thomas S Hatch
7383017ad9
Merge pull request #12022 from s0undt3ch/hotfix/jenkins
...
Add missing import
2014-04-15 16:25:37 -06:00
Pedro Algarvio
9195cd36e1
Add missing import
2014-04-15 23:25:05 +01:00
Ryan Lane
5a4051d5aa
Fix doc string for IAM library.
2014-04-15 15:11:33 -07:00
Ryan Lane
5a2ef865c7
Move IAM credential fetching out of the s3 util.
...
All AWS services can use the IAM credentials, so it's ideal to split
it apart from the S3 utility.
2014-04-15 15:06:16 -07:00
Thomas S Hatch
69527e4e8a
Merge pull request #11989 from terminalmage/issue11873
...
Fix traceback in docker.running state
2014-04-15 16:01:13 -06:00
Seth House
e222a9bd1c
Add missing True return to state example when state is already correct
2014-04-15 15:51:43 -06:00
Erik Johnson
69253afec8
Fix os grains for OpenSolaris/OpenIndiana Development
...
The lack of a space in the OS grain breaks os_family resolution.
Fixes #11907
2014-04-15 16:19:45 -05:00
Thomas S Hatch
309f53ea04
Merge pull request #12011 from terminalmage/release-notes
...
Add release notes for 2014.1.2
2014-04-15 14:11:42 -06:00
Erik Johnson
83e7427fd8
Set proper fallback CONFIG_DIR for NetBSD
...
This is not a critical fix since the official package for NetBSD uses
--salt-config-dir to set the config dir. But, since NetBSD uses pkgsrc,
which defaults to /usr/pkg/etc, a NetBSD-specific fallback should be
set.
See https://github.com/saltstack/salt/issues/11889#issuecomment-40500747
for more information.
2014-04-15 14:46:13 -05:00
Samuel Smith
ad1176bdf5
Merge pull request #12013 from SmithSamuelM/sam_raet_36
...
Fixed Slowdown of Raet Salt
2014-04-15 12:58:20 -06:00
Samuel M Smith
4ab8b97f13
Merge remote-tracking branch 'upstream/develop' into sam_raet_36
2014-04-15 12:52:12 -06:00
