Steve Baker 4b68dfd53d Refactor merging out of cfn collector ...

This is a pure refactoring change which moves the os-apply-config
deployment data merging into its own module. This will allow
other collectors (request, heat) to do the same merging.

Partial-Bug: #1424913
Change-Id: Ic78a60e3efebadbb06ebfd262ceb275ca519a3f2

2015-06-15 09:14:29 +12:00

..

__init__.py

Fix tests for rename.

2013-06-26 13:08:42 -07:00

test_cache.py

Bump hacking to 0.9.x series

2014-11-13 13:11:00 +00:00

test_cfn.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00

test_collect.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00

test_ec2.py

Bump hacking to 0.9.x series

2014-11-13 13:11:00 +00:00

test_heat_local.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00

test_heat.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00

test_keystone.py

Merge "Drop use of 'oslo' namespace package"

2015-05-29 09:40:47 +00:00

test_local.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00

test_merger.py

Refactor merging out of cfn collector

2015-06-15 09:14:29 +12:00

test_request.py

Drop use of 'oslo' namespace package

2015-05-06 18:45:17 +00:00