Mike Place
|
280d8f4bab
|
Remove pillar opts warnings for lithium
|
2015-01-24 03:16:49 +00:00 |
|
Thomas S Hatch
|
62250b68dc
|
Merge pull request #20021 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
|
2015-01-23 18:50:05 -07:00 |
|
Thomas S Hatch
|
a912cd5203
|
Merge pull request #20005 from s0undt3ch/issues/19764-2015.2-BP
BP #19986 - Log the daemons start ups and shut downs.
|
2015-01-23 17:14:04 -07:00 |
|
Colton Myers
|
c331a3c5cc
|
644 permissions
|
2015-01-23 16:59:09 -07:00 |
|
Colton Myers
|
9e9a2eab90
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
salt/fileserver/gitfs.py
salt/loader.py
|
2015-01-23 16:13:30 -07:00 |
|
Thomas S Hatch
|
55cb7fdab1
|
Merge pull request #20015 from basepi/grainsprecedencedocs19611
Fix grains precedence issues
|
2015-01-23 15:40:32 -07:00 |
|
Thomas S Hatch
|
75fa353619
|
Merge pull request #20006 from rallytime/pylint_fifteen
Pylint fixes for the 2015.2 branch
|
2015-01-23 14:06:49 -07:00 |
|
Colton Myers
|
fd6b9eba6d
|
Fix grains loading (and override) order
Order is now core -> _grains -> /etc/salt/grains -> /etc/salt/minion,
overriding at each step
Fixes #19611
Fixes #19612
|
2015-01-23 13:59:37 -07:00 |
|
rallytime
|
69d7a6ebd0
|
Pylint fixes for the 2015.2 branch
|
2015-01-23 10:57:18 -07:00 |
|
Pedro Algarvio
|
068e34c95a
|
Log the daemons start ups and shut downs.
Fixes #19764
|
2015-01-23 17:53:05 +00:00 |
|
Thomas S Hatch
|
487fa9c667
|
Merge pull request #20001 from saltstack/revert-19960-bp-19790
Revert "Backport #19790 to 2014.7"
|
2015-01-23 10:42:29 -07:00 |
|
Thomas S Hatch
|
f21f6c22de
|
Merge pull request #19988 from thatch45/fix_file_test
Fix for a state file change issue, fix for #19833
|
2015-01-23 10:32:17 -07:00 |
|
Nicole Thomas
|
a368183186
|
Merge pull request #20003 from rallytime/pylint_dot_seven
Easy pylint fixes
|
2015-01-23 09:31:19 -07:00 |
|
Nicole Thomas
|
f49edd1ebf
|
Revert "Backport #19790 to 2014.7"
|
2015-01-23 09:22:53 -07:00 |
|
rallytime
|
1ba8a774be
|
Easy pylint fixes
|
2015-01-23 08:57:21 -07:00 |
|
Thomas S Hatch
|
8e0a9e2715
|
Fix for a state file change issue, fix for #19833
|
2015-01-22 20:14:04 -07:00 |
|
Thomas S Hatch
|
19b8c20ac6
|
Merge pull request #19981 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
|
2015-01-22 20:00:11 -07:00 |
|
Thomas S Hatch
|
f57134c073
|
Merge pull request #19974 from rallytime/bp-19768
Backport #19768 to 2015.2
|
2015-01-22 17:55:34 -07:00 |
|
Thomas S Hatch
|
9cdbf2b2f7
|
Merge pull request #19972 from rallytime/bp-19746
Backport #19746 to 2015.2
|
2015-01-22 17:55:27 -07:00 |
|
Thomas S Hatch
|
d44453fb31
|
Merge pull request #19971 from rallytime/bp-19735
Backport #19735 to 2015.2
|
2015-01-22 17:55:19 -07:00 |
|
Thomas S Hatch
|
fd8e4741e6
|
Merge pull request #19968 from jfindlay/no_win_dns
allow user to disable DNS for win net iface
|
2015-01-22 17:54:57 -07:00 |
|
Thomas S Hatch
|
d67add6690
|
Merge pull request #19973 from highlyunavailable/features/fix_file_recurse_prereq_windows
Fixes an error where a prereq of a file.recurse fails on Windows
|
2015-01-22 17:51:37 -07:00 |
|
Thomas S Hatch
|
eb61b1a7fe
|
Merge pull request #19970 from rallytime/dulwich_warnings
Add minimum version warnings to dulwich usage in gitfs
|
2015-01-22 17:48:49 -07:00 |
|
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 |
|