fix merge conflict 59/17959/1
authorTony Hansen <tony@att.com>
Tue, 10 Oct 2017 13:39:42 +0000 (13:39 +0000)
committerTony Hansen <tony@att.com>
Tue, 10 Oct 2017 13:39:52 +0000 (13:39 +0000)
commit0169382eb76ed0d91b3de819bd51f6982c846a0e
tree6dd5db8167b0c4a9c77b6202c29bb6904d0264cc
parent6d5cbab5f8d4274fd6058bad3666388814f40b6f
fix merge conflict

Change-Id: Id2a0760f7ca940646c9c42cd3cef497b4d579503
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: DCAEGEN2-128
blueprints/pgaas-disk.yaml-template