Scott Moser 639af3f314 merge from trunk at revno 799

2013-03-19 08:22:30 -04:00

..

__init__.py

Continue working on merging code.

2013-03-06 19:24:05 -08:00

DataSourceAltCloud.py

Continue working on merging code.

2013-03-06 19:24:05 -08:00

DataSourceCloudStack.py

merge from trunk at revno 799

2013-03-19 08:22:30 -04:00

DataSourceConfigDrive.py

merge from trunk

2013-03-07 16:27:47 -05:00

DataSourceEc2.py

merge from trunk at revno 799

2013-03-19 08:22:30 -04:00

DataSourceMAAS.py

merge from trunk at revno 799

2013-03-19 08:22:30 -04:00

DataSourceNoCloud.py

merge from trunk

2013-03-07 16:27:47 -05:00

DataSourceNone.py

fix pep8 and pylint

2013-03-07 16:47:54 -05:00

DataSourceOVF.py

Make conf.d and the default merging use the new merging algos.

2013-03-06 19:36:31 -08:00