valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
838dc12b77
salt/tests/integration/states
History
rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
..
__init__.py Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
boto_sns.py Py3 compatibility 2015-01-30 22:27:10 +00:00
bower.py Implement Bower state module 2015-02-21 05:57:54 +00:00
cmd.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-16 12:15:44 -06:00
compiler.py Change all relevant Boron references to 2016.3.0 2016-02-10 15:45:28 -07:00
file.py Merge branch '2015.8' into '2016.3' 2016-02-18 11:10:44 -07:00
git.py Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
handle_error.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
handle_iorder.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
host.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
match.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
mysql.py tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
npm.py Changed npm integration test to install request. 2016-02-10 14:31:16 -07:00
pip.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-24 10:19:03 -06:00
pkg.py Merge branch '2015.5' into '2015.8' 2016-03-06 10:59:46 -07:00
pkgrepo.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2016-01-21 14:37:32 -07:00
rabbitmq_user.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rabbitmq_vhost.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
renderers.py Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
ssh.py tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
supervisord.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
svn.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
user.py users: integration test for empty GECOS fields 2015-08-07 09:25:21 +02:00
virtualenv.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00