From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 16 Feb 2015 09:22:26 +0000 (+0000)
Subject: Merge "Do not override odlparent properties"
X-Git-Tag: release/lithium~556
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=26781cd2c5165e44842d6a2bba49e15e705e1171

Merge "Do not override odlparent properties"
---

26781cd2c5165e44842d6a2bba49e15e705e1171