rallytime
1e4b93dec9
Python 3 compat fixes for develop
2015-04-17 12:00:01 -06: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
586b81b33e
Add tests for the jinja demands
2015-04-15 16:39:08 -06:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Justin Findlay
56364ff571
adding cmd.run state integration tests
2015-04-06 20:32:22 -06:00
Pedro Algarvio
ff4aa5b989
Include unless in the state internal keywords.
...
Fixes #22359
2015-04-05 01:00:08 +01:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05: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
Viet Hung Nguyen
2a845989b7
bugfix: fix test mode in ssh_known_hosts
...
- present func: should not require key/fingerprint.
In normal mode, key AND fingerprint can be omitted but
test mode requires them, so fix the test mode to behave same
way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
2015-03-07 00:58:32 +07:00
Alexander Pyatkin
5edb6cba11
Implement Bower state module
2015-02-21 05:57:54 +00:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Pedro Algarvio
ff636249f4
Py3 compatibility
2015-01-30 22:27:10 +00:00
Pedro Algarvio
6b0c88e3bf
Py3 compatibility
2015-01-30 22:27:05 +00:00
Pedro Algarvio
79be964dc2
We need to write something, even an empty string
2015-01-30 22:25:19 +00:00
Pedro Algarvio
b791dd6971
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
fdc467b587
Py3 compatibility fixes
2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258
Py3 compatibility fixes
2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Mike Place
09d3d62174
Loosen test constraint and update runas arg
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
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -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
4542072c4e
Add boto_sns module and state.
...
Include integration tests.
2015-01-22 14:40:32 -07:00
Mathias Gug
f4c75375f4
Make sure boto_sns state is idempotent.
2015-01-22 12:13:33 -08:00
Mathias Gug
85ec021a73
Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
...
Conflicts:
tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5
Support subscriptions in sns topic state.
2015-01-22 11:04:31 -08:00
Pedro Algarvio
8dbb7394b2
White-space lint fix
2015-01-21 14:17:03 +00:00
Thomas S Hatch
fab600add9
Merge pull request #19746 from lyft/add-boto-sns-module
...
Add boto_sns module and state.
2015-01-16 16:58:09 -07:00
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08:00
Mathias Gug
64cf74ebaa
Fix style.
2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e
Fix style.
2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Mike Place
fc9a647a3b
Remove assert:
2015-01-12 18:53:56 -07:00
Mike Place
cba0d6d597
Fix tests
2015-01-12 16:01:10 -07:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -07:00
rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -07:00
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -07:00
rallytime
5490530504
Change the install package to fix pip tests
2015-01-08 09:32:53 -07:00
rallytime
4e87557748
--local is not available in older versions of git
...
Also adjust the tests:
subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -07:00
