Starblade42
2dd5904119
Fixes an issue where Pagerduty states/modules couldn't find it's profile in the Pillar
...
The pagerduty state currently only works if the pagerduty profile is set
up in the minion config or the master config (if using the pagerduty
runner). This just makes it so it will also look in the pillar for the
specified profile name.
2015-06-03 16:17:04 -06:00
Justin Findlay
3ca35d1ec3
Merge pull request #24366 from terminalmage/pecl-yes
...
Use yes $'\n' instead of printf '\n' for pecl commands
2015-06-03 15:28:58 -06:00
Colton Myers
86a3b317c6
Merge pull request #24348 from makinacorpus/lxcpre
...
Try to close input pipes before calling lxc-start
2015-06-03 13:38:07 -06:00
Justin Findlay
d71d75e2ec
Merge pull request #24372 from rallytime/release_notes
...
Add 2015.5.2 release notes
2015-06-03 13:30:45 -06:00
rallytime
f5ec1a1693
Add 2015.5.2 release notes
2015-06-03 13:27:17 -06:00
Justin Findlay
76927c9ea1
Merge pull request #24346 from rallytime/bp-24271
...
Backport #24271 to 2015.5
2015-06-03 12:44:31 -06:00
Justin Findlay
4afa03d8e3
Merge pull request #24345 from rallytime/bp-24013
...
Backport #24013 to 2015.5
2015-06-03 12:39:41 -06:00
Mathieu Le Marec - Pasquet
0cb11a2767
lxc: typo
2015-06-03 20:18:56 +02:00
Thomas S Hatch
c3392c246a
Merge pull request #24365 from jacobhammons/DocFixes
...
Fixes for PDF build errors
2015-06-03 11:50:02 -06:00
Erik Johnson
dcd9ad8b6e
Use yes $'\n' instead of printf '\n' for pecl commands
...
This allows extensions with multiple questions to be installed without
hanging. See:
https://github.com/saltstack/salt/pull/5882#issuecomment-108442378
Note: this only affects pecl functions called with defaults=True.
2015-06-03 11:54:36 -05:00
Jacob Hammons
0fc190267f
Fixes for PDF build errors
2015-06-03 09:18:20 -06:00
Thomas S Hatch
ae681a4db1
Merge pull request #24313 from nicholascapo/fix-22991-npm.installed-test-true
...
Fix #22991 Correctly set result when test=True
2015-06-03 08:49:18 -06:00
Thomas S Hatch
d57a9a267c
Merge pull request #24312 from nicholascapo/fix-18966-file.serialize-test-true
...
Fix #18966 : file.serialize supports test=True
2015-06-03 08:49:06 -06:00
Thomas S Hatch
6b694e3495
Merge pull request #24302 from jfindlay/pkg_tests
...
fix pkg hold/unhold integration test
2015-06-02 21:27:43 -06:00
Joseph Hall
aca8447ced
Merge pull request #24349 from rallytime/fix-14021
...
Remove references to mount_points in ec2 docs
2015-06-02 19:54:09 -06:00
Nicholas Capo
ac9644cb19
Fix #22991 npm.installed correctly set result on test=True
2015-06-02 18:09:19 -05:00
rallytime
a235b114d7
Remove references to mount_points in ec2 docs
...
Fixes #14021
2015-06-02 16:32:26 -06:00
Mathieu Le Marec - Pasquet
d71efa6d66
Try to close input pipes before calling lxc-start
...
This should fix #24284
This refs lxc/lxc#548
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-06-02 23:59:25 +02:00
Randy Bias
04067b6833
Fixed the setup instructions
...
Fixed the instructions in the code to match the website (http://docs.saltstack.com/en/latest/topics/cloud/gce.html ).
2015-06-02 15:44:18 -06:00
Jean-Baptiste Quenot
16e0732b50
Fix enabling a service on Ubuntu #24012
...
This reverts commit bd6f5ea370
2015-06-02 15:42:25 -06:00
Nicholas Capo
e7328e7043
Fix #18966 file.serialize correctly set result on test=True
...
* Use file.check_managed_changes to diff the file when test=True
2015-06-02 15:50:28 -05:00
Justin Findlay
c2db0b1758
fix pkg hold/unhold integration test
2015-06-02 11:56:18 -06:00
Justin Findlay
88a997e6ee
Merge pull request #24328 from dr4Ke/fix_state_grains_silently_fails_2015.5
...
Fix state grains silently fails 2015.5
2015-06-02 09:18:46 -06:00
Christophe Drevet-Droguet
8a63d1ebbe
fix state grains silently fails #24319
2015-06-02 13:29:59 +02:00
Christophe Drevet-Droguet
ca1af20203
grains state: add some tests
2015-06-02 13:29:52 +02:00
Nicole Thomas
7dcd9bb5de
Merge pull request #24310 from techhat/mapwarning
...
Add warning about destroying maps
2015-06-01 21:01:28 -06:00
Joseph Hall
ca535a6ff4
Add warning about destroying maps
2015-06-01 15:25:58 -06:00
Thomas S Hatch
02bfb254d6
Merge pull request #24281 from steverweber/ipmi_docfix
...
Ipmi docfix
2015-06-01 11:45:36 -06:00
Nicole Thomas
73cd2cbe1f
Merge pull request #24287 from jfindlay/pkg_test
...
fix pkg test on ubuntu 12.04 for realz
2015-06-01 08:16:37 -06:00
Justin Findlay
02017a074c
Merge pull request #24279 from rallytime/bp-24263
...
Backport #24263 to 2015.5
2015-05-31 22:29:34 -06:00
Justin Findlay
2ba696d54a
Merge pull request #24277 from rallytime/fix_iptables_jump
...
Put a space between after_jump commands
2015-05-31 22:28:26 -06:00
Justin Findlay
98944d8c7f
fix pkg test on ubuntu 12.04 for realz
2015-05-31 22:23:17 -06:00
rallytime
e2d1606b19
Move after_jump split out of loop
2015-05-31 17:25:08 -06:00
rallytime
d14f1307b6
Remove extra loop
2015-05-31 13:17:06 -06:00
Steve Weber
dd36f2c555
yaml formating
...
yaml formating
2015-05-31 14:37:21 -04:00
Steve Weber
f6deef3047
include api_kg kwarg in ipmi state
...
include api_kg kwarg in ipmi state
2015-05-31 14:36:01 -04:00
Steve Weber
a7d4e97bb9
doc cleanup
...
doc cleanup
2015-05-31 14:26:01 -04:00
Steve Weber
0ded2fdbef
save more cleanup to doc
...
more doc cleanup
2015-05-31 14:18:16 -04:00
Steve Weber
08872f2da3
fix name api_key to api_kg
...
fix name api_key to api_kg.
2015-05-31 13:41:23 -04:00
Steve Weber
165a387681
doc fix add api_kg kwargs
...
doc fix add api_kg kwarg and fix some kwargs
2015-05-31 13:38:15 -04:00
Steve Weber
1ec78887e4
cleanup docs
...
cleanup docs.. hide IpmiCommand and IpmiSession and use some cleaner formating for the header..
2015-05-31 13:32:34 -04:00
Jason Thigpen
beff7c7785
Correct usage of import_yaml in formula documentation
2015-05-31 09:43:15 -06:00
rallytime
42ed5320b6
Put a space between after_jump commands
...
Refs #24226
2015-05-31 08:51:30 -06:00
Nicole Thomas
113eba34ec
Merge pull request #24262 from basepi/dictupdatefix
...
More dictupdate after #24142
2015-05-30 22:09:37 -06:00
Colton Myers
0c4832c0d4
Raise a typeerror if non-dict types
2015-05-30 13:54:43 -06:00
Colton Myers
be21aaa122
Pylint
2015-05-30 13:44:14 -06:00
Justin Findlay
785d5a1bfc
Merge pull request #24269 from makinacorpus/zfs
...
zfs: Fix spurious retcode hijacking in virtual
2015-05-30 11:47:49 -06:00
Mathieu Le Marec - Pasquet
0bf23ce701
zfs: Fix spurious retcode hijacking in virtual
2015-05-30 19:02:25 +02:00
Colton Myers
bb8a6c6cc9
More optimization
2015-05-29 18:10:45 -06:00
Colton Myers
c933249d1a
py3 compat
2015-05-29 18:04:26 -06:00
