Justin Findlay
90819f9c37
Merge pull request #24923 from jayeshka/status-states-unit-test
...
adding states/status unit test case.
2015-06-24 09:50:07 -06:00
Mike Place
2dd24ece71
Merge pull request #24902 from cro/fixfo2
...
Fix minion failover, document same
2015-06-24 09:20:43 -06:00
Mike Place
087ee09f46
Merge pull request #24926 from rallytime/bp-22263
...
Back-port #22263 to 2015.5
2015-06-24 09:09:40 -06:00
Justin Findlay
b34a74fe89
Merge pull request #24900 from rallytime/bp-24848
...
Back-port #24848 to 2015.5
2015-06-24 09:09:18 -06:00
Justin Findlay
a546e8e326
Merge pull request #24899 from rallytime/bp-24847
...
Back-port #24847 to 2015.5
2015-06-24 09:09:01 -06:00
Justin Findlay
d4dd8d288d
Merge pull request #24898 from rallytime/bp-24845
...
Back-port #24845 to 2015.5
2015-06-24 09:06:09 -06:00
Justin Findlay
693085520f
Merge pull request #24897 from rallytime/bp-24839
...
Back-port #24839 to 2015.5
2015-06-24 09:05:35 -06:00
Mike Place
8c92d9c677
Prevent a load from being written if one already exists
...
This is a workaround for a problem introduced when loads are being written on returns, which was originally introduced to ensure that a load is *always* written, even if run in masterless mode or from lower-level masters in a syndic setup.
Ultimately, we'll want to re-address that strategy but this prevents the corrupted loads for the time being.
2015-06-24 07:18:14 -06:00
Jayesh Kariya
baec650674
adding states/status unit test case.
2015-06-24 17:23:13 +05:30
C. R. Oldham
90c73ff446
References to documentation.
2015-06-23 11:40:06 -06:00
C. R. Oldham
f0c9204d8b
Add references to failover parameters in conf
2015-06-23 11:07:45 -06:00
C. R. Oldham
9da96a8b95
Docs
2015-06-23 11:06:12 -06:00
C. R. Oldham
e2314f0e49
Move comment.
2015-06-23 10:57:36 -06:00
C. R. Oldham
b9a756ff5f
Fix master failover and add documentation for same. Factor in syndics. Syndics will not failover (yet).
2015-06-23 10:56:18 -06:00
Justin Findlay
1650233be9
Merge pull request #24891 from jayeshka/ssh_known_hosts-states-unit-test
...
adding states/ssh_known_hosts unit test case.
2015-06-23 10:46:57 -06:00
Nitin Madhok
d2b5456f5d
Correcting bash code blocks
2015-06-23 10:41:15 -06:00
Borut Mrak
1e4ec7a56b
unset size parameter for lxc.create when backing=zfs
...
When using the lxc.create parameter backing=zfs the default 1G size parameter kicks in, which sadly makes the lxc-create call fail.
LXC backing store type zfs does not support setting the container storage size ATM.
This fixes this error message in the minion log:
2015-06-20 02:00:57,588 [salt.minion ][ERROR ][3694] A command in 'lxc.create' had a problem: Container could not be created with cmd 'lxc-create -n test-container -t download -B zfs --fssize 1G -- --release trusty --arch amd64 --dist ubuntu': filesystem type and size are only valid with block devices
2015-06-23 10:39:34 -06:00
James J Porter
071049ae7a
fix bug in docker.loaded
2015-06-23 10:37:58 -06:00
ipm
f3b20d5445
fix for issue #24799
2015-06-23 10:36:29 -06:00
Jayesh Kariya
ef1347f2b3
adding states/ssh_known_hosts unit test case.
2015-06-23 15:53:46 +05:30
Joseph Hall
c32aae96aa
Merge pull request #24874 from dkiser/salt-cloud-24870
...
Fix for salt-cloud when ssh key used to auth and using sudo.
2015-06-22 17:46:07 -06:00
Joseph Hall
ddaa21c0ae
Merge pull request #24880 from dkiser/salt-cloud-24871
...
Fix to allow password for salt-cloud to be set outside of a vm specif…
2015-06-22 17:44:59 -06:00
dkiser
4f6c035673
Fix to allow password for salt-cloud to be set outside of a vm specific context.
...
Fixes #24871 .
2015-06-22 15:42:01 -07:00
dkiser
6c31143b22
Fix key error for the PR to fix #24870 .
2015-06-22 15:37:34 -07:00
dkiser
bdcf7d88c1
Fix pylint for #24874 .
2015-06-22 14:21:22 -07:00
dkiser
8f66d193e0
Fix for salt-cloud when ssh key used to auth and using sudo.
...
Fixes #24870
2015-06-22 13:59:10 -07:00
Thomas S Hatch
3902b162a9
Merge pull request #24852 from pruiz/issue-24851
...
Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name
2015-06-22 16:37:13 -04:00
Justin Findlay
6c5b788afd
Merge pull request #24861 from jayeshka/ssh_auth-states-unit-test
...
adding states/ssh_auth unit test case.
2015-06-22 10:20:01 -06:00
Thomas S Hatch
9e3321c18e
Merge pull request #24824 from kev009/grains-bhyve-bsd
...
Detect bhyve virtual type for FreeBSD guests
2015-06-22 11:24:35 -04:00
Thomas S Hatch
7b07ef9f44
Merge pull request #24795 from alprs/fix-salt_ssh_state_apply
...
Fix state.apply for salt-ssh
2015-06-22 11:23:57 -04:00
Mike Place
31d4c131e9
Merge pull request #24832 from jacksontj/2015.5
...
Don't incur a "_load_all" of the lazy_loader while looking for mod_init.
2015-06-22 09:17:09 -06:00
Jayesh Kariya
e5d7b0de80
adding states/ssh_auth unit test case.
2015-06-22 17:29:08 +05:30
Pablo Ruiz
73adb1df50
Fix regular expression so it now matches packages with '.' or '-' at pkg name.
2015-06-20 21:02:08 +02:00
Thomas Jackson
cfa7c0a699
pylint
2015-06-19 11:45:35 -07:00
Nicole Thomas
2d8148fb4d
Merge pull request #24834 from rallytime/bp-24811
...
Back-port #24811 to 2015.5
2015-06-19 12:43:49 -06:00
Justin Findlay
d2edb63cff
Merge pull request #24790 from rallytime/bp-24741
...
Back-port #24741 to 2015.5
2015-06-19 11:25:58 -06:00
Justin Findlay
645e62a43c
Merge pull request #24789 from rallytime/bp-24717
...
Back-port #24717 to 2015.5
2015-06-19 11:17:00 -06:00
Justin Findlay
0a6c70f062
Merge pull request #24823 from jayeshka/splunk_search-states-unit-test
...
adding states/splunk_search unit test case.
2015-06-19 11:14:12 -06:00
rallytime
e2684ecf0b
Add notes to map and gogrid docs -- don't use -P with map files
2015-06-19 11:02:06 -06:00
Thomas Jackson
be18439736
Don't incur a "_load_all" of the lazy_loader while looking for mod_init.
...
Since we were checking if mod_init is in the loader dict-- and we still allow for module merging (#20540 ) we will do a load_all for every module without mod_init. This patch makes it so we load w/e module the function is in, then check if we have loaded a mod_init. This cuts out ~600ms on my local simple state.sls runs
2015-06-19 08:52:55 -07:00
Mike Place
4c5a708599
Merge pull request #24809 from jodv/single_item_master_list
...
Correctly create single item list for failover master type with string value for master opt
2015-06-19 09:22:20 -06:00
Kevin Bowling
a2262097a1
Detect bhyve virtual type for freebsd guests
2015-06-19 03:20:52 -07:00
Jayesh Kariya
98831a8cb0
adding states/splunk_search unit test case.
2015-06-19 15:15:49 +05:30
Colton Myers
ae05e70e94
Merge pull request #24802 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-06-18 14:11:58 -06:00
Colton Myers
5b7a65d6d9
Merge pull request #19 from twangboy/merge-forward-fixes
...
Fixed test failures for Colton
2015-06-18 13:02:26 -06:00
twangboy
98e7e90299
Fixed test failures for Colton
2015-06-18 12:58:18 -06:00
Jeremy Rosenbaum
18ceebc77f
single item list vs. list of characters
2015-06-18 11:30:01 -07:00
Justin Findlay
daa76c34e4
Merge pull request #24798 from saltstack/revert-24329-postgres_database-states-unit-test
...
Revert "adding states/postgres_database unit test case."
2015-06-18 11:56:16 -06:00
Mike Place
7073a9f850
Merge pull request #24791 from rallytime/bp-24749
...
Back-port #24749 to 2015.5
2015-06-18 11:43:15 -06:00
Colton Myers
b949856ae6
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-06-18 11:37:17 -06:00
