Colton Myers
|
422c641233
|
Remove test failing because of mocks -- it's deprecated anyway
|
2015-11-02 19:42:01 -07:00 |
|
Colton Myers
|
32969b2408
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
|
2015-11-02 18:19:01 -07:00 |
|
justinta89
|
7ca79f1f7b
|
Skipped wipefs test if wipefs does not exist on OS
|
2015-10-30 15:04:33 -06:00 |
|
Justin Findlay
|
0dc72135de
|
update blockdev exec and state module unit tests
|
2015-10-23 18:12:43 -06:00 |
|
Justin Findlay
|
beb9715d0e
|
update blockdev tests for deprecation
|
2015-07-08 14:50:52 -06:00 |
|
Ronald van Zantvoort
|
b8b44b63b9
|
Deprecation colons were lonely
typofix
|
2015-06-23 18:50:36 +02:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
rallytime
|
69d484d65d
|
pylint fix
|
2015-01-07 00:57:50 +00:00 |
|
rallytime
|
f40affd5d9
|
Fix blockdev module unit tests
|
2015-01-06 23:00:12 +00:00 |
|
Pedro Algarvio
|
94f05e62fa
|
Allow standalone test execution
|
2014-03-31 02:58:15 +01:00 |
|
Pedro Algarvio
|
720a094142
|
Fix lint issues and make use of the helpers.
Double to single quotes.
|
2014-02-12 15:32:55 +00:00 |
|
Michal Bicz
|
6ad4415ac1
|
blockdev state, module and test
|
2014-02-11 00:11:29 -08:00 |
|