valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,767 Commits 24 Branches 182 Tags 341 MiB
945e6506b6
Commit Graph

38767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
David Boucha
2108465d64 Merge pull request #16899 from garethgreenaway/slack_returner 
Slack module fixes, Slack state module and Slack returner.
 2014-10-27 15:22:18 -06:00
Gareth J. Greenaway
c16108b8d8 Switching slack module to use requests instead of pyslack. Adding slack state and returner. 2014-10-27 11:46:00 -07:00
Colton Myers
a7815e2b35 Merge pull request #16934 from basepi/prereqdocs16826 
Fix pre-required vs pre-requiring mixups in prereq doc
 2014-10-27 10:59:58 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
Joseph Hall
079db261af Merge pull request #16924 from holmboe/noop-if 
Remove no-op if statement
 2014-10-27 10:19:48 -06:00
Joseph Hall
fdae721b70 Merge pull request #16928 from garethgreenaway/16843_20147_7_iptables_save 
fixes to iptables state.
 2014-10-27 10:15:57 -06:00
Joseph Hall
d7dc35f569 Merge pull request #16931 from cachedout/issue_16883 
Fix typo
 2014-10-27 09:55:05 -06:00
Mike Place
055520f54e Fix typo 2014-10-27 09:40:35 -06:00
Gareth J. Greenaway
6930af7a44 Allowing iptables state to save rules if rule already exists and save=true 2014-10-27 07:09:40 -07:00
Henrik Holmboe
f3d7590ee4 Remove no-op if statement 2014-10-27 12:14:27 +01:00
Erik Johnson
ed374a9225 Merge pull request #16922 from nerdling/patch-1 
Update doc/topics/installation/osx.rst
 2014-10-26 15:02:58 -06:00
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst 
Unify instructions across package managers.
 2014-10-26 16:20:13 -04:00
Nicole Thomas
6eed822cd2 Merge pull request #16911 from terminalmage/update-version-template 
Update release candidate number in docs sidebar
 2014-10-25 17:30:42 -06:00
Erik Johnson
142bac1522 Update release candidate number in docs sidebar 2014-10-25 17:56:28 -05:00
Pedro Algarvio
2b60e66c08 Merge pull request #16909 from techhat/sshkwargs 
Rename kwargs back to ssh_kwargs
 2014-10-25 18:49:48 +01:00
Joseph Hall
1bada41794 Rename kwargs back to ssh_kwargs 2014-10-25 10:20:48 -06:00
Joseph Hall
8140a50b22 Merge pull request #16908 from rallytime/develop 
Merge forward
 2014-10-25 10:13:09 -06:00
rallytime
22a4c09f84 Pylint fix 2014-10-25 09:28:23 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Thomas S Hatch
e7311ba05e Merge pull request #16903 from techhat/backport16886 
Backport #16886 to 2014.7
 2014-10-24 21:50:57 -06:00
Joseph Hall
2e9d40fb23 Backport #16886 to 2014.7 2014-10-24 20:58:57 -06:00
Thomas S Hatch
c74cd88403 Merge pull request #16894 from rallytime/bp-16815 
Backport #16815 to 2014.7
 2014-10-24 18:01:32 -06:00
Thomas S Hatch
f3f388d4d4 Merge pull request #16897 from rallytime/bp-16877 
Backport #16877 to 2014.7
 2014-10-24 17:46:37 -06:00
Thomas S Hatch
eeb9c408f3 Merge pull request #16895 from rallytime/bp-16797 
Backport #16797 to 2014.7
 2014-10-24 17:29:15 -06:00
Thomas S Hatch
7bff44726a Merge pull request #16896 from thatch45/jacksontj-2014.7-config 
Merge #16889 with fixes
 2014-10-24 17:27:13 -06:00
Thomas S Hatch
841d9a8d24 Merge pull request #16893 from rallytime/bp-16813 
Backport #16813 to 2014.7
 2014-10-24 17:08:34 -06:00
Jason R. McNeil
08a7359daf Use the image id as name is not unique for DigitalOcean images. 
Conflicts:
	salt/cloud/clouds/digital_ocean_v2.py
 2014-10-24 16:56:00 -06:00
Thomas S Hatch
939191ae6e Merge pull request #16892 from rallytime/cloud_test_update 
Change profile name for Digital Ocean cloud tests
 2014-10-24 16:53:45 -06:00
Thomas S Hatch
a81898f0b1 Fix broken salt ssh extension mods dir 2014-10-24 16:45:45 -06:00
Thomas S Hatch
3c86949667 Merge branch '2014.7-config' of https://github.com/jacksontj/salt into jacksontj-2014.7-config 2014-10-24 16:45:18 -06:00
Thomas S Hatch
2e7fe19ee2 Merge pull request #16891 from rallytime/bp-16809 
Backport #16809 to 2014.7
 2014-10-24 16:39:04 -06:00
rallytime
429c17aef3 Pylint fix 2014-10-24 16:36:24 -06:00
Thomas S Hatch
ce28ee1b89 Merge pull request #16890 from rallytime/bp-16798 
Backport #16798 to 2014.7
 2014-10-24 16:35:09 -06:00
Mike Place
0492e84130 Catch error conditions in quota.get_mode 
Closes #16381
 2014-10-24 16:34:56 -06:00
Thomas S Hatch
e8738638f5 Merge pull request #16886 from techhat/filemap 
Add file_map to salt.utils.cloud.bootstrap-enabled providers
 2014-10-24 16:33:40 -06:00
Tanoti
6858ce751d Fixed invalid archive type error message, was reporting 'name' not 'archive_format' 2014-10-24 16:31:17 -06:00
Henrik Holmboe
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -06:00
Henrik Holmboe
1fc008bf25 Point to the correct latest 2014.1.13 release 
This is recurring and #12720 is tracking the issue.

Conflicts:
	doc/topics/releases/index.rst
 2014-10-24 16:27:11 -06:00
rallytime
617d777fa9 Release notes for 2014.1.13 2014-10-24 16:22:53 -06:00
Thomas S Hatch
c12dc911b2 Merge pull request #16841 from isbm/salt-zypper 
Package lock management support for Zypper
 2014-10-24 16:16:20 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests 
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
 2014-10-24 16:14:02 -06:00
Thomas S Hatch
0fed446cd4 Merge pull request #16877 from jasonrm/fix/digitalocean-list-images 
Fix salt-cloud list-images for DigitalOcean images
 2014-10-24 16:05:29 -06:00
Thomas S Hatch
d40d675b3e Merge pull request #16812 from syphernl/fix/tomcat_tabstrip 
Strip off tabs for tomcat version calls
 2014-10-24 16:03:23 -06:00
Thomas S Hatch
c6718fc373 Merge pull request #16884 from terminalmage/issue16874 
Install repoquery if not present on yum-based distro
 2014-10-24 16:02:04 -06:00
Thomas S Hatch
ce21d6ea4a Merge pull request #16881 from jacksontj/2014.7 
Fixes for Syndic
 2014-10-24 16:01:23 -06:00
vs
6f85a95ea5 only add mine.update to schedular if function is available 2014-10-24 15:59:42 -06:00
Mike Place
ab0b45cab7 Avoid key error in connected_ids() 
Continue through the loop if we could't access the grains instead of
crashing and burning.

Closes #15143
 2014-10-24 15:55:58 -06:00
Thomas Jackson
3438db0a0e Fix for #16888 
We can't set the default value to something if you want the config to be relative to cachedir.

Since there is already code in apply_minion_config to take care of this we remove this, meaning now that if you set cachedir it won't break these
 2014-10-24 14:49:49 -07:00
Samuel Smith
a2d77c4f87 Merge pull request #16887 from SmithSamuelM/sam_dev1 
Added partial support for Multi-Master in Raet
 2014-10-24 15:43:41 -06:00