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
Pedro Algarvio
f0eeef58e0
Switch to rich comparison for Py3 support
...
Fixes #20014
2015-01-24 02:05:48 +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
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
a8544afa1c
Merge pull request #20018 from cachedout/pydsl_separate
...
Split a test out into its own class to keep it from colliding
2015-01-23 17:14:55 -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
4faca4f169
Merge pull request #20002 from jacksontj/loader
...
Don't let exit()'s within modules stop the daemons.
2015-01-23 17:13:48 -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
Thomas Jackson
1cac52f2a5
pylint again
2015-01-23 16:06:33 -08:00
jfindlay
fdc76184e7
Merge pull request #20020 from jfindlay/fix_ddns_tests
...
reenable ddns_test
2015-01-23 16:59:19 -07:00
Colton Myers
c331a3c5cc
644 permissions
2015-01-23 16:59:09 -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
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
Justin Findlay
63369b0a1d
reenable ddns_test
2015-01-23 16:04:52 -07:00
Mike Place
b2ef5292c0
Lint
2015-01-23 15:49:02 -07:00
Mike Place
ffa004a26c
Fix exception that happens inside jinja renderer during test run
2015-01-23 15:49:02 -07:00
Mike Place
df4b369e30
Split a test out into its own class to keep it from colliding
...
Otherwise, setUp/tearDown clobbers the class var in HighState, resulting
in frequent failures.
2015-01-23 15:49:02 -07:00
Thomas S Hatch
efd529af14
Merge pull request #20011 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-23 15:40:58 -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
Samuel Smith
2d9056186a
Merge pull request #20017 from SmithSamuelM/sam_20150122
...
Removed debug statement
2015-01-23 15:20:46 -07:00
Thomas Jackson
db554abed4
Remove exit() from testing
2015-01-23 14:17:53 -08:00
Samuel M Smith
20b3967700
Merge remote-tracking branch 'upstream/develop' into sam_20150122
2015-01-23 15:17:44 -07:00
Samuel M Smith
a967ea9f20
removed debug import
2015-01-23 15:17:12 -07:00
Colton Myers
dd61682968
Fix runtests permissions
2015-01-23 14:22:19 -07:00
Colton Myers
ab41da0e23
Satisfy OCD
2015-01-23 14:21:42 -07:00
Colton Myers
8bba4bbec4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/msazure.py
salt/modules/boto_sns.py
salt/states/boto_sns.py
tests/integration/modules/boto_sns.py
tests/integration/states/boto_sns.py
2015-01-23 14:20:34 -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
Thomas S Hatch
6d9244fa04
Merge pull request #20008 from rallytime/pylint_develop
...
Pylint fix for develop
2015-01-23 14:02:25 -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
Mike Place
41aac973a8
Merge pull request #20007 from cachedout/fix_environ_test
...
Let's see if this is any better in jenkins
2015-01-23 11:58:48 -07:00
rallytime
523295f4f0
Pylint fix for develop
2015-01-23 11:02:14 -07:00
Mike Place
545e17c8f5
Let's see if this is any better in jenkins
2015-01-23 11:00:13 -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
