Pedro Algarvio
64566a37ef
Define some client internal keywords which are expected(and skip errors on them)
2015-01-24 03:16:50 +00:00
Pedro Algarvio
f2276afac9
Start raising SaltInvocationError
2015-01-24 03:16:50 +00:00
Pedro Algarvio
01ee8613e6
Lithium is 2015.2.x
2015-01-24 03:16:50 +00:00
Mike Place
09d3d62174
Loosen test constraint and update runas arg
2015-01-24 03:16:50 +00:00
Mike Place
1b590ea6ea
Still fixing tests
2015-01-24 03:16:50 +00:00
Mike Place
d9c9eb1a6a
Yet even more test fixing. *sigh*
2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5
Even MORE test fixing
2015-01-24 03:16:50 +00:00
Mike Place
7222d741de
Even more pip test fixing
2015-01-24 03:16:50 +00:00
Mike Place
f14eeaabc1
Fix more failing tests
2015-01-24 03:16:50 +00:00
Mike Place
a8e6bd24e9
Fix failing pip tests
2015-01-24 03:16:49 +00:00
Mike Place
b8e9249c80
Added docs for Lithium deprecations
2015-01-24 03:16:49 +00:00
Mike Place
e50246b855
Remove deprecations in eselect module
2015-01-24 03:16:49 +00:00
Mike Place
34dc39bb23
Remove deprecations in pip state
2015-01-24 03:16:49 +00:00
Mike Place
cb2e33e353
Remove deprecations in eselect state
2015-01-24 03:16:49 +00:00
Mike Place
fdd887043f
Removed unnecessary warning
2015-01-24 03:16:49 +00:00
Mike Place
d2617e1d13
Deprecated quiet option
2015-01-24 03:16:49 +00:00
Mike Place
767dc23d7f
Deprecate runas in pip module
2015-01-24 03:16:49 +00:00
Mike Place
280d8f4bab
Remove pillar opts warnings for lithium
2015-01-24 03:16:49 +00:00
Thomas S Hatch
85e32d1811
Merge pull request #20023 from basepi/gpgrenderersaltssh19114
...
Partially revert #19912
2015-01-23 18:50:27 -07: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
19db9adf4a
Add in the beacons to the main minion run, still need multiminion and raet
2015-01-23 17:18:19 -07:00
Thomas S Hatch
5913ae050c
Merge pull request #20024 from eliasp/2014.7-states.file.replace-don't-report-changes-on-test=True
...
Fix states.file.replace() always reporting changes on test=True.
2015-01-23 17:15:50 -07:00
Thomas S Hatch
02fa494770
Merge pull request #20012 from eliasp/2014.7-states.git.latest-test=True
...
states.git.latest - Don't report changes on test=True when there aren't any.
2015-01-23 17:14:27 -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
Thomas S Hatch
7ac742ba9e
Merge pull request #20022 from jfindlay/yes_win_dns
...
require DNS for win network.managed state
2015-01-23 17:12:30 -07:00
Colton Myers
c331a3c5cc
644 permissions
2015-01-23 16:59:09 -07:00
Thomas S Hatch
4c9097a8e3
change process to return a list of events
2015-01-23 16:47:00 -07:00
Elias Probst
4737412895
Fix states.file.replace() always reporting changes on test=True.
2015-01-24 00:44:00 +01:00
Colton Myers
e3b471d0e8
Partially revert #19912
2015-01-23 16:41:15 -07:00
Justin Findlay
7d23ad56de
require DNS for win network.managed state
...
Unfixes #18513 . The original fix (#19968 ) I submitted was incomplete,
and I've found that I'll have to do more work than I originally though
to make it happen, so here's a manual revert for now so that the code
isn't broken.
2015-01-23 16:17:45 -07:00
Thomas S Hatch
9f81c0d988
Add the first commit for the new beacons plugin system
2015-01-23 16:16:30 -07:00
Thomas S Hatch
6084964c8a
Add loader entry function for beacons
2015-01-23 16:15:21 -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
Elias Probst
9fc6ac4c00
Don't report changes on test=True when there aren't any.
2015-01-23 20:41:25 +01: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
