Add support for merging OS::Nova::Server
authorClint Byrum <clint@fewbar.com>
Fri, 13 Sep 2013 15:42:01 +0000 (08:42 -0700)
committerClint Byrum <clint@fewbar.com>
Fri, 13 Sep 2013 16:08:53 +0000 (09:08 -0700)
commita8d5dc5a23bf8a681ab5695b421f04a17547d65c
treeb765d2cb97e24314bb3f1e715e112c550795681a
parenta5320b8f49d17e4ad6790ecafe5797382ba381a1
Add support for merging OS::Nova::Server

Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
merge.py