Merge "Make removing nodes from scaled items possible."
authorJenkins <jenkins@review.openstack.org>
Wed, 13 Aug 2014 20:05:17 +0000 (20:05 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 13 Aug 2014 20:05:17 +0000 (20:05 +0000)
commitf797a2eadd656591273456664186fb3e8ad26804
tree6258341f1bbb62f10fcdf6133c9415ca61241043
parent8a99e7d461f211f43751d5c72c8dbc5d1ae05ead
parent3e35d53061cb65032373ca3c0104cde4720af1f0
Merge "Make removing nodes from scaled items possible."
tripleo_heat_merge/merge.py