valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,392 Commits 24 Branches 182 Tags 341 MiB
0bbe01b2f0
Commit Graph

36392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
3c00f7487d Cleanup the logic-- no reason to have so many negatives 2014-10-28 08:07:07 -07:00
Seth House
4675cfa9d2 Added changes dict to apache.configfile state in test mode 2014-10-28 08:55:49 -05:00
Seth House
72732ea8a0 Fix apache_module states to return None and changes dict in test mode 
Fixes #16953.
 2014-10-28 08:53:54 -05:00
Chris Reeves
0384172eb9 Added inspect option to modules.dockerio.get_containers to return more 
graunular information about running containers.
 2014-10-28 09:29:08 +00:00
Pedro Algarvio
99b8caf488 Update to the latest bootstrap script, v2014.10.28 
* Install the python systemd bindings for Arch and Fedora git installations
* Allow cloning from Salt's git repository using HTTPS. saltstack/salt-bootstrap#475
 2014-10-28 02:37:50 +00:00
Mike Place
8dc8ee51be Merge pull request #16942 from rallytime/module_state_tests 
Added unit tests for module state
 2014-10-27 18:13:11 -06:00
Erik Johnson
94c9340adf Don't try to use text_type to force saltenv to be unicode 
This breaks salt code that uses raw string formatting (i.e. {0!r})
 2014-10-27 17:07:07 -06:00
Nicole Thomas
353be9779a Merge pull request #16938 from cachedout/issue_10466 
Better error messages for failed dns resolution
 2014-10-27 17:03:26 -06:00
Erik Johnson
2a88e291d9 Load svnfs config values as strings 2014-10-27 15:54:48 -06:00
Erik Johnson
44104163f1 Load hgfs config values as strings 2014-10-27 15:54:48 -06:00
Erik Johnson
d20a803c8d Load gitfs config values as strings 2014-10-27 15:54:48 -06:00
Erik Johnson
947262d31e Force saltenv to be a string when passed to state compiler 2014-10-27 15:54:48 -06:00
Mike Place
c458fa19b9 Better error messages for failed dns resolution 2014-10-27 14:41:04 -06: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
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
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
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
rallytime
c4d6097220 Remove debugging lines 2014-10-24 17:23:33 -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
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
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
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
rallytime
19d70dfac5 Added another test to module.run state unit tests 2014-10-24 15:28:03 -06:00
Thomas Jackson
bd4c3ba583 Cleanup all other returners to handle the new passed_jid argument 2014-10-24 14:17:58 -07:00
Erik Johnson
d1e867c718 Remove known issue comment for salt-ssh 2014-10-24 16:16:33 -05:00