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
44,689 Commits 24 Branches 182 Tags 341 MiB
f25505f0dd
Commit Graph

44689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
f609366dee Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
 2015-01-22 16:53:22 -07:00
Colton Myers
c391f880eb Merge pull request #19982 from basepi/2014.7.1release 
Release 2014.7.1 (docs sidebar and release date for release notes)
 2015-01-22 16:52:56 -07:00
Colton Myers
f1e7661973 Release 2014.7.1 (docs sidebar and release date for release notes) 2015-01-22 16:52:21 -07:00
Colton Myers
079e20a536 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-22 16:48:27 -07:00
Colton Myers
63195007d6 Merge pull request #19980 from rallytime/update_windows_release_docs 
Add 2014.7.1 release to Windows Installation Docs
 2015-01-22 16:48:15 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
Ryan Lane
5d008aa799 CLI examples and docstrings 2015-01-22 14:49:30 -07:00
Ryan Lane
f875d23cc1 Fix lint error 2015-01-22 14:49:30 -07:00
Ryan Lane
31c69421cc Initial grafana state and elasticache execution modules 2015-01-22 14:49:30 -07:00
Mathias Gug
b3e94b6683 Add documentation. 
Fix style.
 2015-01-22 14:41:19 -07:00
Mathias Gug
6f13d6feca Document remaining module functions. 2015-01-22 14:41:13 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
228ea72251 Remove reference to SQS. 2015-01-22 14:40:43 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state. 
Include integration tests.
 2015-01-22 14:40:32 -07:00
Tiru Srikantha
3b2abe8c40 Fixes an error where a state with a prereq of a file.recurse fails on Windows. 
Any state with a file.recurse fails on Windows because file.py's function
check_managed_changes function is not imported into win_file.py.
 2015-01-22 13:37:07 -08:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-22 14:24:30 -07:00
Mathias Gug
801c3b2a9b Fix coding style violations. 2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d Add comment. 2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-22 14:24:29 -07:00
rallytime
e23bdeafcb Add minimum version warnings to dulwich usage in gitfs 2015-01-22 14:15:33 -07:00
Justin Findlay
bbb83a8be7 allow user to disable DNS for win net iface 
fixes #18513
 2015-01-22 13:53:18 -07:00
Nicole Thomas
f3019a8bf8 Merge pull request #18400 from terminalmage/issue17700 
Fix gitfs serving symlinks
 2015-01-22 12:49:42 -07:00
Thomas S Hatch
2b97da4015 Merge pull request #19964 from Trax-air/fix-list-nodes 
Fix list nodes
 2015-01-22 12:43:10 -07:00
Thomas S Hatch
945a0169f8 Merge pull request #19961 from rallytime/bp-19855 
Backport #19855 to 2014.7
 2015-01-22 12:42:45 -07:00
Thomas S Hatch
21da224ad5 Merge pull request #19960 from rallytime/bp-19790 
Backport #19790 to 2014.7
 2015-01-22 12:42:35 -07:00
Thomas S Hatch
43f4451cc0 Merge pull request #19959 from RobertFach/doc-19875-gitfs-dulwich 
updated information regarding required version for dulwich gitfs backend
 2015-01-22 12:41:59 -07:00
Thomas S Hatch
491cfbfab1 Merge pull request #19937 from nshalman/fix-esky-version-2014.7 
SmartOS Esky: fix build version identification (backport of saltstack/salt#19936)
 2015-01-22 12:26:07 -07:00
Thomas S Hatch
9cce5449c5 Merge pull request #19930 from highlyunavailable/feature/fix_tar_options 
Split out tar options into long and short array-based arguments
 2015-01-22 12:23:06 -07:00
Thomas S Hatch
a67798455b Merge pull request #19927 from jfindlay/fix_sysctl 
create /etc/sysctl.d/99-salt.conf if not present
 2015-01-22 12:22:04 -07:00
Flavian
8561b360ee Added url in role dict from list_nodes_full 2015-01-22 19:08:18 +01:00
Flavian
41122287a4 Fixed wait_for_async prototype again 2015-01-22 18:54:47 +01:00
Flavian
7a491b5438 If only one VM remains, catch the error from delete_role and delete the 
deployment
 2015-01-22 18:52:30 +01:00
Flavian
ae8ca44d25 Trying to use delete_role instead 2015-01-22 18:44:37 +01:00
Flavian
c48a2eb38a forgotten call=action 2015-01-22 18:28:07 +01:00
Flavian
85dd96466b get the service_name as being the deployment_name from show_instance, 
deletes the vm and then waits for the async operation to be finished
 2015-01-22 18:26:30 +01:00
Flavian
2845f9c738 fixed show_instance with the new list_nodes_full 2015-01-22 18:09:44 +01:00
Flavian
ca293bc6ff Changed deployment name to service name in destroy for azure 2015-01-22 18:03:17 +01:00
Flavian
815338ed26 Removed a statement where stopped machines couldn't be deleted from a 
map
 2015-01-22 17:56:58 +01:00
Flavian
202df84e04 Fixes state name in list nodes full 2015-01-22 17:51:24 +01:00
Colin Coghill
28af4efe0d Fix for docker login saltstack/salt#18673 2015-01-22 09:27:25 -07:00
Mike Place
cf830791fd Remove unnecessary comment 2015-01-22 09:22:48 -07:00
Mike Place
f1aaf1bef7 Fix multi-master event handling bug 
We had a situation wherein minion generators would race to the sub
socket and only a single minion would actually act on the package. The
result was that events such as refresh_pillar would cause one (or
sometimes both) minions to stop responding. This changes the behaviour
so that the first instance to get the request calls action on all
instances.

While this has the possible side-effect of blocking for O(n) inside the event
handling loop, it also ensures that multi-master minions update in a
linear fashion.
 2015-01-22 09:22:48 -07:00
robert.fach
4f7b0a29d1 updated information regarding required version for dulwich gitfs backend 2015-01-22 17:14:27 +01:00
Nicole Thomas
ee8844bf0d Merge pull request #19944 from rallytime/fix_linuxlvm_test 
Fix assertion string in failing linux_lvm unit test
 2015-01-22 07:47:49 -07:00
Flavian
8ccba662ea Invert deployment and role in the dict returned by list_nodes_full 2015-01-22 11:56:00 +01:00
rallytime
670538c9cd But only fix it in the correct place... 2015-01-22 01:22:18 -07:00
rallytime
e4856b6fc7 Fix assertion string in failing linux_lvm unit test 2015-01-22 01:20:16 -07:00