rallytime
|
2a5dab3c56
|
Use six.iteritems(object) in boto_s3_bucket module and boto_s3_bucket_test
|
2016-07-11 14:26:06 -06:00 |
|
rallytime
|
cc83fa151a
|
Merge branch '2016.3' into 'develop'
Conflicts:
- salt/modules/status.py
- salt/utils/__init__.py
- tests/unit/modules/boto_vpc_test.py
- tests/unit/modules/mount_test.py
- tests/unit/states/boto_vpc_test.py
|
2016-06-28 17:34:27 -06:00 |
|
rallytime
|
c87a108a12
|
Don't forget the pylint disables for range
|
2016-06-28 16:52:37 -06:00 |
|
rallytime
|
359e8ca2ce
|
Pylint fixes
|
2016-06-28 16:04:47 -06:00 |
|
rallytime
|
f078d57b57
|
Merge branch '2016.3' into 'develop'
Conflicts:
- salt/modules/rabbitmq.py
- salt/modules/win_servermanager.py
- salt/state.py
- salt/states/boto_s3_bucket.py
- salt/states/pip_state.py
- salt/states/win_servermanager.py
- tests/unit/modules/win_servermanager_test.py
- tests/unit/states/dockerng_test.py
|
2016-06-09 13:06:10 -06:00 |
|
Tom Williams
|
102d696460
|
INFRA-1594 - fix up unit tests
|
2016-06-06 14:37:38 -04:00 |
|
Dan Slimmon
|
f87bc347fd
|
Fixed ACL user comparison. Resolves #33754.
|
2016-06-04 15:14:00 +00:00 |
|
Kris Raney
|
3c6d0e8fc1
|
Make sure there are no connection object cache hits on boto_* unit tests.
|
2016-03-22 14:49:18 -06:00 |
|
Kris Raney
|
890648aca0
|
Make sure there are no connection object cache hits on boto_* unit tests.
|
2016-03-17 15:07:43 -05:00 |
|
Kris Raney
|
14f7bf693b
|
Pylint fixes
|
2016-01-21 11:37:43 -06:00 |
|
Kris Raney
|
4ad20f6217
|
Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests.
|
2016-01-21 11:28:53 -06:00 |
|