Colton Myers
|
fd93491a5f
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
|
2015-03-16 15:12:02 -06:00 |
|
Mike Place
|
debc936d29
|
Re-align test for saltclienterror exception
|
2015-03-11 13:43:55 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Anthony Scalisi
|
55d1da42d3
|
fix typo in spec
|
2014-12-08 14:34:02 -08:00 |
|
Mike Place
|
1daa9a4d69
|
Fix failing test in develop
Add progress
|
2014-11-25 10:31:27 -07:00 |
|
Pedro Algarvio
|
9f7ead2e33
|
Remove unused imports
|
2014-06-15 13:05:18 +01:00 |
|
Pedro Algarvio
|
000655d7f4
|
Use SaltClientTestCaseMixIn instead
|
2014-06-15 13:05:18 +01:00 |
|
Pedro Algarvio
|
c4e47df943
|
Don't use the hardcoded path
|
2014-06-05 10:10:55 +01:00 |
|
Pedro Algarvio
|
36ea569d0d
|
Don't use hard coded paths
|
2014-06-05 10:10:55 +01:00 |
|
David Boucha
|
9dc182a2f4
|
fix codeauthor misspellings
|
2014-05-21 18:59:02 -06:00 |
|
Pedro Algarvio
|
ca76e31ac9
|
Allow standalone execution
|
2014-03-23 16:58:40 +00:00 |
|
Pedro Algarvio
|
cbe4c360b0
|
Remove unused imports
|
2014-02-08 07:59:57 +00:00 |
|
Pedro Algarvio
|
68f26f1176
|
Don't expect salt to be installed to run the tests.
Use the testing configuration files.
|
2014-01-03 01:04:43 +00:00 |
|
Mike Place
|
cb2abcb796
|
Pylint fixes.
|
2014-01-02 16:28:19 -07:00 |
|
Mike Place
|
2e20bf99a3
|
Client testing
* Minor spelling and doc fixes to client module
* Unit testing client module.
|
2014-01-02 16:23:16 -07:00 |
|