Bruno Clermont
|
0aa1416b6b
|
Don't acquire lock if there is no formatter
this cause locking when a log handler don't have a formatter (because it don't need one)
|
2015-07-28 10:01:34 -06:00 |
|
Thomas S Hatch
|
1fae76d53c
|
Merge pull request #25685 from twangboy/fix_25594
Fixed regex issues with comment and uncomment
|
2015-07-28 09:29:49 -06:00 |
|
Thomas S Hatch
|
0bdb29402a
|
Merge pull request #25763 from twangboy/fix_25437
Fix 25437
|
2015-07-28 09:29:27 -06:00 |
|
Florian Ermisch
|
a0dad3b845
|
image_present: if len(acceptable) drops to 0 we've got a problem...
|
2015-07-28 17:29:22 +02:00 |
|
Florian Ermisch
|
763189c459
|
cherry-picking some clean-up
|
2015-07-28 17:21:57 +02:00 |
|
Florian Ermisch
|
fa219d3c84
|
import of prototype of image_update() from lithium branch glance_state_module
|
2015-07-28 17:17:51 +02:00 |
|
Florian Ermisch
|
2e7b154a5c
|
Catch HTTPForbidden and return an Error
|
2015-07-28 17:00:59 +02:00 |
|
Florian Ermisch
|
73ba331f1f
|
Refresh image details if active but w/o checksum
|
2015-07-28 16:48:50 +02:00 |
|
Florian Ermisch
|
a6d7d3f5ce
|
Add missing parameter "protected" to image_create
|
2015-07-28 16:15:16 +02:00 |
|
Florian Ermisch
|
0b89931376
|
image_list:check saltversion to determine behavior
I'm not supposed to do this, am I?
|
2015-07-28 14:42:22 +02:00 |
|
Florian Ermisch
|
e54ef56c24
|
build ret{} with matching images
doesn't work with multiple images of the same
name b/c ret is keyed with the images' names!
|
2015-07-28 13:50:28 +02:00 |
|
Florian Ermisch
|
5350baa8e5
|
Catch HTTPNotFound and return error
|
2015-07-28 13:14:58 +02:00 |
|
Florian Ermisch
|
95db1d603a
|
added option "test" - not yet well tested :D
|
2015-07-28 12:51:50 +02:00 |
|
Florian Ermisch
|
076f20cbbe
|
Add optional parameter "name"
As states are identified by names and not random
IDs we don't want to have to check for a not-yet-
known value.
|
2015-07-28 12:47:38 +02:00 |
|
Andreas Lutro
|
4ce0606a31
|
iptables.build_rule - rule is a list, not a string
|
2015-07-28 10:07:45 +02:00 |
|
Nicole Thomas
|
13c2377e95
|
Merge pull request #25764 from gtmanfred/2015.8
allow use of cloudnetworks in ssh_interface
|
2015-07-27 20:40:06 -06:00 |
|
Seth House
|
c1236595f9
|
Merge pull request #25752 from thatch45/state_top_saltenv
State top saltenv
|
2015-07-27 19:02:10 -06:00 |
|
Daniel Wallace
|
53ce470c48
|
make sure to set access_ip
Note: ssh_interface has to be in the provider for this to work with map
files, right now at least
|
2015-07-27 18:06:19 -05:00 |
|
Daniel Wallace
|
9890041cc2
|
fix appostrophe
|
2015-07-27 16:19:32 -05:00 |
|
twangboy
|
a904e8329b
|
Fixed another test failure...
|
2015-07-27 15:05:23 -06:00 |
|
Daniel Wallace
|
51859396d4
|
add a note in the documentation for openstack
about the cloud networks in ssh_interfaces
|
2015-07-27 16:01:35 -05:00 |
|
Daniel Wallace
|
a1b3d4126f
|
add ability to specify a cloudnetwork in ssh_interfaces
|
2015-07-27 15:59:28 -05:00 |
|
twangboy
|
9e70c800b9
|
The real fix for 25437 that doesn't break other crap
|
2015-07-27 14:53:12 -06:00 |
|
twangboy
|
d7347e01e5
|
Revert "Fixed problem trying to load file with name of boolean type"
This reverts commit c53e11d42c.
|
2015-07-27 14:21:08 -06:00 |
|
David Boucha
|
f367acb253
|
Merge pull request #25755 from twangboy/fix_25717
Fixed problem with dunder functions not being passed
|
2015-07-27 13:31:22 -06:00 |
|
David Boucha
|
f05ae95f9c
|
Merge pull request #25648 from twangboy/fix_25352
Clarified functionality of reg module, fixed state to work with new module
|
2015-07-27 13:30:33 -06:00 |
|
Thomas S Hatch
|
5b24f6a61f
|
Merge pull request #25736 from jfindlay/format
insert explicit formatter number
|
2015-07-27 11:46:34 -06:00 |
|
Justin Findlay
|
e74fdeaf90
|
Merge pull request #25742 from rallytime/bp-25731
Back-port #25731 to 2015.8
|
2015-07-27 11:42:14 -06:00 |
|
Justin Findlay
|
4f41e91a7c
|
Merge pull request #25741 from rallytime/bp-25727
Back-port #25727 to 2015.8
|
2015-07-27 11:41:53 -06:00 |
|
twangboy
|
10e410504d
|
Fixed problem with dunder functions not being passed
|
2015-07-27 11:29:51 -06:00 |
|
twangboy
|
aa077d3a86
|
Fixed more tests... justin findlay helped me...
|
2015-07-27 11:18:25 -06:00 |
|
Shane Lee
|
d6496ce814
|
Merge pull request #1 from jfindlay/reg
fix reg unit tests
|
2015-07-27 11:00:39 -06:00 |
|
Peter Tripp
|
9ec3ae96d4
|
Add file as supported protocol for file source_hash. Fixes #23764.
Conflicts:
salt/modules/file.py
|
2015-07-27 11:59:28 -05:00 |
|
Justin Findlay
|
3b0cc6592a
|
fix reg unit tests
|
2015-07-27 10:57:05 -06:00 |
|
Thomas S Hatch
|
65d6ec0659
|
don't override the minion config unless requested
|
2015-07-27 10:51:03 -06:00 |
|
Thomas S Hatch
|
26c858361c
|
Add state_top_saltenv to the config chain
|
2015-07-27 10:50:06 -06:00 |
|
Thomas S Hatch
|
36a3b674a7
|
Add raet support for state_top_saltnev
|
2015-07-27 10:49:42 -06:00 |
|
Thomas S Hatch
|
f6fa025b13
|
Add saltenv top file support to salt master_opts
|
2015-07-27 10:49:15 -06:00 |
|
Thomas S Hatch
|
4a1c53309b
|
Add state_top_saltenv support
|
2015-07-27 10:48:50 -06:00 |
|
Charlie Root
|
361f6cc23f
|
Allow zpool.create on character devices
Fixes #24920
|
2015-07-27 16:30:20 +00:00 |
|
Thomas S Hatch
|
29c66d85a4
|
Merge pull request #25740 from rallytime/bp-25722
Back-port #25722 to 2015.5
|
2015-07-27 10:08:40 -06:00 |
|
Thomas S Hatch
|
135b03e53b
|
Merge pull request #25739 from rallytime/bp-25709
Back-port #25709 to 2015.5
|
2015-07-27 10:08:27 -06:00 |
|
Thomas S Hatch
|
095a923b6e
|
Merge pull request #25738 from rallytime/bp-25671
Back-port #25671 to 2015.5
|
2015-07-27 10:08:23 -06:00 |
|
Thomas S Hatch
|
05fbfe64e9
|
Merge pull request #25737 from rallytime/bp-25608
Back-port #25608 to 2015.5
|
2015-07-27 10:08:18 -06:00 |
|
Thomas S Hatch
|
9817fc5556
|
Merge pull request #25733 from davidjb/mount-fix
Avoid IndexError when listing mounts if mount output ends in newline
|
2015-07-27 10:08:05 -06:00 |
|
Thomas S Hatch
|
82ba390b7b
|
Merge pull request #25705 from blackduckx/augeas-setm
Support for setm augeas command.
|
2015-07-27 10:07:10 -06:00 |
|
Thomas S Hatch
|
3a15df22ac
|
Merge pull request #25704 from cachedout/master_type_2014_7
Ensure prior alignment with master_type in 2014.7
|
2015-07-27 10:06:35 -06:00 |
|
Thomas S Hatch
|
f732be365d
|
Merge pull request #25703 from cachedout/master_type_2015_5
Return to `str` for master_type for 2015.5
|
2015-07-27 10:06:22 -06:00 |
|
David Boucha
|
dea3d31578
|
Merge pull request #25702 from twangboy/fix_25144
Fixed win_user module for groups with spaces in the name
|
2015-07-27 09:06:33 -06:00 |
|
David Boucha
|
186af9b54d
|
Merge pull request #25711 from twangboy/fix_25351
Fixed problem with win_servermanager.list_installed
|
2015-07-27 09:05:48 -06:00 |
|