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
|
c91a593507
|
Fix test to give more data on failure
|
2015-03-27 16:50:39 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Daniel Mizyrycki
|
e421aff68d
|
Fix lint
|
2014-10-17 15:39:49 -07:00 |
|
Daniel Mizyrycki
|
54738d0ff5
|
Added salt-ssh integration test for custom module within SLS
|
2014-10-17 15:39:49 -07:00 |
|