valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,796 Commits 24 Branches 182 Tags 341 MiB
7e528d1050
Commit Graph

48796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrique Garbi
7e528d1050 Tomcat module fails to extract version number from snapshot builds #24520 2015-06-24 14:48:28 +01: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
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
Justin Anderson
179ce03d93 Revert "adding states/postgres_database unit test case." 2015-06-18 10:24:11 -06:00
C. R. Oldham
1a158e8a3b Merge pull request #24792 from rallytime/bp-24757 
Back-port #24757 to 2015.5
 2015-06-18 09:58:35 -06:00
Andreas Lutro
905840b1fa Fix state.apply for salt-ssh 
Closes #24746
 2015-06-18 17:56:50 +02:00
C. R. Oldham
0f9298263b Merge pull request #24768 from jfindlay/pkg_mod 
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
 2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789 Fix loader call in pyobjects 2015-06-18 09:11:45 -06:00
Oliver Bestwalter
be43b2b394 add windows specfic default for multiprocessing 
multiprocessing has to be set to false on windows and should be done automatically like it is done with ipc_mode
 2015-06-18 09:08:18 -06:00
Cameron Norman
a54245f080 Add missing import 2015-06-18 09:04:14 -06:00
Cameron Norman
4ce6370d6e salt.modules.upstart: fix lint errors 2015-06-18 09:04:14 -06:00
Cameron Norman
aec53ec32a Improve Upstart enable/disable handling 
* Properly search for manual stanza instead of just override
* Handle "manual" stanzas in both override and regular conf files
* Do not try to disable/enable already enabled services
* Do not overwrite override files (use append) on disable
* Only delete empty override files on enable
 2015-06-18 09:04:14 -06:00
Gunnlaugur Þór Briem
95ac4eba13 virtualenv.managed: document user and no_chown 
gh-24716
 2015-06-18 09:03:00 -06:00
Mike Place
39f088a74c Merge pull request #24778 from nmadhok/backport-2015.2-24777 
Backporting PR #24777 to 2015.2 branch
 2015-06-18 08:53:04 -06:00
Mike Place
4281dfff0b Merge pull request #24780 from nmadhok/backport-2014.7-24777 
Backporting PR #24777 to 2014.7 branch
 2015-06-18 08:52:56 -06:00
Mike Place
2a4f65f3f7 Merge pull request #24774 from zefrog/fix-lxc-lvname-param 
Fix lxc lvname parameter command
 2015-06-18 08:49:06 -06:00
Mike Place
fd7339014b Merge pull request #24782 from jayeshka/slack-states-unit-test 
adding states/slack unit test case.
 2015-06-18 08:33:55 -06:00
Mike Place
f3c5cb2d41 Merge pull request #24769 from msteed/issue-21318 
Fix stacktrace in get_cli_returns()
 2015-06-18 08:31:46 -06:00
Mike Place
c9c90af512 Merge pull request #24771 from jacksontj/2015.5 
Always extend requisites, instead of replacing them
 2015-06-18 08:29:09 -06:00
Jayesh Kariya
e2b6214764 adding states/slack unit test case. 2015-06-18 15:47:27 +05:30