Colton Myers
|
c4f5e231fa
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
|
2015-05-29 15:10:13 -06:00 |
|
Justin Findlay
|
6b6280442c
|
disable intermittently failing tests
This commit is to be reverted when #23623 is merged.
|
2015-05-28 16:23:57 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Pedro Algarvio
|
8e93faa072
|
Fix lint errors
|
2014-10-08 01:02:11 +01:00 |
|
Pedro Algarvio
|
dee2c91fde
|
Test the runner client under tests/integration/clients
|
2014-10-08 01:00:20 +01:00 |
|