twangboy
96bc5aed10
Fixed more testing stuff, an egregious error
2015-06-29 12:27:22 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
C. R. Oldham
0f9298263b
Merge pull request #24768 from jfindlay/pkg_mod
...
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
2015-06-18 09:13:12 -06:00
Thomas Jackson
b1211c5422
Re-enable tests for complex prereq and prereq_in
...
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9
disable pkg.hold test for RHEL/CentOS 5
2015-06-17 16:36:36 -06:00
mattmb
a5607d5e07
Multiple onchanges requisite behaviour
...
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
2015-06-16 15:02:11 +01:00
Colton Myers
5b49e89b43
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-12 11:42:42 -06:00
Justin Findlay
d88fb22fdc
fix pkg module integration tests on CentOS 5
2015-06-11 14:56:52 -06:00
Justin Findlay
fb91b40ba0
fix pkg module integration tests on ubuntu 12
2015-06-11 12:46:22 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
Justin Findlay
c2db0b1758
fix pkg hold/unhold integration test
2015-06-02 11:56:18 -06:00
Colton Myers
a6a868be6b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/iptables.py
salt/utils/dictupdate.py
2015-06-01 10:29:32 -06:00
Justin Findlay
98944d8c7f
fix pkg test on ubuntu 12.04 for realz
2015-05-31 22:23:17 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Justin Findlay
9508924c02
fix pkg mod integration test on ubuntu 12.04
2015-05-29 15:52:57 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Justin Findlay
f1bd5ec404
adding pkg module integration tests
2015-05-23 19:34:37 -06:00
Colton Myers
4ea3f8f80a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/pillar/neutron.py
salt/utils/http.py
2015-05-15 13:43:40 -06:00
Justin Findlay
b8867a8c23
update pip tests
2015-05-15 00:15:26 -06:00
Justin Findlay
9ea2f477b9
more than ZMQ supported for transport, other typos
2015-05-04 23:24:46 -06:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-21 10:33:39 -06:00
Pedro Algarvio
ae2bca1f6f
Fix W1504(unidiomatic-typecheck
2015-04-21 14:02:17 +01:00
Pedro Algarvio
b62df62151
Don't assume package installation order.
...
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
f8cdc5060e
fix sysdoc tests for new module level hooks
2015-04-15 19:42:23 -06:00
Colton Myers
cc8785e980
Fix the test.fib tests
2015-04-11 14:48:59 -04:00
Colton Myers
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
salt/beacons/service.py
salt/beacons/sh.py
salt/modules/cassandra_cql.py
salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
Colton Myers
ed51f2bb7c
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-31 11:25:27 -06:00
Joshua Semar
a5b28ad24d
fix tests return value
2015-03-30 16:42:19 -05:00
Joshua Semar
95aa3518d5
fix cas behavior on data module
...
data.cas was not saving changes. We now call dump after
receiving the change
2015-03-30 16:01:28 -05:00
Colton Myers
bdfdd3f232
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Thomas S Hatch
13b7046227
Merge pull request #21461 from jfindlay/refactor_crons
...
Refactor unix crons
2015-03-11 09:52:28 -06:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Justin Findlay
5dc09e7da1
update cron and cmd tests for cron runas changes
2015-03-10 15:57:24 -06:00
Vincent Desjardins
d5293901bc
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-10 09:17:48 -06:00
Vincent Desjardins
7e517a6a5a
fixes #20198 : virt.get_graphics and virt.get_nics calls in module virt
2015-03-09 22:10:38 -04:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Colton Myers
8c1fa5358e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/debian_ip.py
salt/modules/file.py
salt/states/ssh_auth.py
salt/utils/cloud.py
2015-03-09 11:50:21 -06:00
Thomas Jackson
9fa37fd46b
Add raw boolean support to depends decorator
2015-03-05 21:59:10 -08:00
Erik Johnson
0a077c14e3
Update test_valid_docs for nspawn compatibility funcs
2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86
Merge pull request #21083 from cachedout/request_test
...
Fix error in state.request
2015-03-03 10:00:14 -07:00
Justin Findlay
a6b86ef627
indent quoted code in cmdmod tests
2015-03-02 16:08:49 -07:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
