rallytime
|
d23010a114
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- salt/modules/aptpkg.py
- salt/states/libcloud_dns.py
- salt/states/pkg.py
- tests/integration/modules/test_pkg.py
- tests/unit/modules/test_mac_brew.py
- tests/unit/modules/test_pkgutil.py
- tests/unit/modules/test_zypper.py
- tests/unit/states/libcloud_dns_test.py
|
2017-05-15 16:41:59 -06:00 |
|
Pedro Algarvio
|
abe608d739
|
Drop @patch usage
|
2017-04-28 13:36:42 +01:00 |
|
Pedro Algarvio
|
99bc71dc4e
|
Proper mocking.
|
2017-03-28 19:04:01 +01:00 |
|
Pedro Algarvio
|
9b1e55aa85
|
Import the full module namespace to avoid import shadowing.
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
|
2017-03-28 19:02:47 +01:00 |
|
Pedro Algarvio
|
40a64191a1
|
Absolute imports and A LOT of code cleanup.
|
2017-03-01 01:33:07 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|