Mike Place
74558f5743
Merge pull request #26362 from garethgreenaway/2015_5_26327_more_invisible_mount_options
...
Fixes to mount state.
2015-08-17 11:44:55 -06:00
rallytime
9f88f11ccd
Add versionadded directives for #26312
2015-08-17 11:43:13 -06:00
Nicole Thomas
a870b79748
Merge pull request #26312 from fictivekin/vpc_name_in_secgroup
...
allow vpc_name instead of vpc_id for boto_secgroup
2015-08-17 11:39:41 -06:00
Mike Place
94062b478e
Set log_level properly
...
This is now safe to do with the parser changes made by @s0undt3ch
2015-08-17 11:20:29 -06:00
Nicole Thomas
7dbbd90c98
Merge pull request #26379 from s0undt3ch/issues/backport-26353
...
[2015.5] Backport #26353
2015-08-17 11:19:28 -06:00
Jason Hamner
b2fa2ac9d3
Fixes autosign_timeout usage in check_autosign_dir
...
Fixes #24334
2015-08-17 11:00:25 -06:00
Daniel Wallace
a14bcef054
don't require volume endpoint in nova driver
...
fixes #25955
2015-08-17 12:00:23 -05:00
rallytime
211f6feaf5
Fix test failures - get_attributes shouldn't be called if none are provided
2015-08-17 10:58:44 -06:00
TheBigBear
6221e69c14
Fix shell quoting for cmd.run
...
In my tests this fixed issue saltstack#26114 , maybe somebody needs to test for regressions? re-submitted against 2015.8 branch as requested by @twangboy
2015-08-17 17:47:04 +01:00
rallytime
f2896c0877
Allow the creation of a VM without a profile
...
Fixes #26369
2015-08-17 10:41:05 -06:00
Joseph Hall
8b525116fc
Merge pull request #26357 from codehotter/call-action-on-instance-id
...
Not ready for merge! Call action on instance-id
2015-08-17 10:33:57 -06:00
Bastiaan Bakker
ec8d4b0470
test wether RETVAL is 0 with -eq rather than =.
2015-08-17 17:20:33 +02:00
Justin Findlay
4bf5c28efa
Merge pull request #26377 from jagguli/develop
...
Avoid key error if 'Status' is not present in container info.
2015-08-17 09:00:22 -06:00
Justin Findlay
3ae37cdc21
Merge pull request #26376 from TheBigBear/patch-7
...
minor edit spelling
2015-08-17 08:59:35 -06:00
Justin Findlay
d239ba6cf6
Merge pull request #26373 from TheBigBear/patch-6
...
Fix shell quoting for cmd.run in win_pkg.py
2015-08-17 08:46:56 -06:00
Justin Findlay
2201809ce7
Merge pull request #26367 from gtmanfred/develop
...
use the same quotes as the join
2015-08-17 08:43:27 -06:00
Loren Carvalho
33ed315c85
fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods
2015-08-17 15:33:51 +01:00
Pedro Algarvio
a73ca74bc3
White-space lint fix
2015-08-17 15:28:22 +01:00
Justin Findlay
d47c71352e
Merge pull request #26353 from sixninetynine/develop
...
fixed a typo in setup.py
2015-08-17 08:28:08 -06:00
Justin Findlay
ef4dbd8b16
Merge pull request #26347 from 0xf10e/allow_pkgng_on_fbsd9
...
Load 'pkgng' as 'pkg' on FreeBSD 9 when `providers:pkg` == 'pkgng'
2015-08-17 08:26:06 -06:00
Justin Findlay
ad34921ae7
Merge pull request #26344 from hs-calc/patch-1
...
Adds antix to _OS_FAMILY_MAP in grains/core.py
2015-08-17 08:25:58 -06:00
Steven Joseph
1199218bec
Avoid key error if 'Status' is not present in container info.
...
- assumes container is not running if 'Status' not present
2015-08-17 22:35:50 +10:00
TheBigBear
f9d2664def
minor edit
2015-08-17 13:23:46 +01:00
Pedro Algarvio
8f69530f65
Add the unit tests for Schema in a DictItem properties
2015-08-17 13:20:18 +01:00
Pedro Algarvio
cb2aaa876c
Handle Schema items
2015-08-17 13:19:04 +01:00
Pedro Algarvio
fa826c9ba2
Add a validation test for DictItem required attribute validation
2015-08-17 13:58:22 +01:00
Pedro Algarvio
f74cc21d70
DictItem must also define it's require attribute
2015-08-17 13:56:00 +01:00
Pedro Algarvio
a0af17dbde
Double to single quotes
2015-08-17 13:54:12 +01:00
TheBigBear
2c949494ed
Update win_pkg.py
2015-08-17 12:35:35 +01:00
TheBigBear
3ffa1609a4
Fix shell quoting for cmd.run
...
In my tests this fixed issue https://github.com/saltstack/salt/issues/26114 , maybe somebody needs to test for regressions?
2015-08-17 11:40:22 +01:00
Bastiaan Bakker
a83a5de41e
fix issue #26161 : on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown.
2015-08-17 11:11:12 +02:00
Daniel Wallace
38f72e5ce7
use the same quotes as the join
2015-08-16 20:13:26 -05:00
Daniel Wallace
50dbd83a1a
clean up lint
2015-08-16 19:52:10 -05:00
Joseph Hall
6c243b1557
Merge pull request #26361 from TronPaul/aws-sec-token
...
sign security token
2015-08-16 11:42:13 -06:00
Gareth J. Greenaway
6fe9b64554
Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time. #26327
2015-08-16 08:19:18 -07:00
Gareth J. Greenaway
cf532d46dd
Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time.
2015-08-16 08:15:05 -07:00
Mark McGuire
2a2b49d52d
sign security token
2015-08-16 10:00:12 -05:00
Emanuel Rietveld
d4e6a17ea2
Allow calling an action on instance-id, passing the instance-id to driver as name
2015-08-16 13:03:32 +02:00
Emanuel Rietveld
25771fc030
_get_node return instance info directly, not a dict of instances
2015-08-16 13:02:39 +02:00
Daniel Wallace
903371ca8c
add documentation for pgjsonb queue
2015-08-16 04:35:27 -05:00
Daniel Wallace
166f5e5d59
add postgres jsonb queue
...
So that I can put more than just the name information in a queue
2015-08-16 04:29:03 -05:00
Daniel Wallace
48e23ed476
add batch to orchestrate runner
...
closes #12556
2015-08-16 01:51:48 -05:00
Loren Carvalho
4afc820fd5
fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods
2015-08-15 21:04:51 -07:00
0xf10e
9d18265948
remove redundant backslashes
2015-08-15 20:41:05 +02:00
Sean Coates
1ede9dbca0
add docstring to satisfy jenkins
2015-08-15 12:51:43 -04:00
Joseph Hall
acf450e35f
Merge pull request #26346 from TronPaul/s3-sec-token
...
Fix s3 using IAM credentials
2015-08-15 10:18:20 -06:00
0xf10e
ef4a9f9a93
don't load freebsdpkg when providers:pkg == 'pkgng'
2015-08-15 18:08:11 +02:00
0xf10e
00cd8524da
actually load pkgng when providers:pkg == "pkgng"
2015-08-15 18:07:43 +02:00
Mark McGuire
88bd1438b3
Fix s3 using IAM credentials
...
- pass `salt.utils.aws.IROLE_CODE` as the access_key and secret_key
to `salt.utils.aws.sig4` so that sig4 grabs the full IAM
credentials when it calls `creds`
2015-08-15 09:09:19 -05:00
hs-calc
4dfb1dd8e4
Adds antix to _OS_FAMILY_MAP in grains/core.py
2015-08-15 12:00:42 +02:00