Merge "Do not override odlparent properties"
authorTony Tkacik <ttkacik@cisco.com>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 16 Feb 2015 09:22:26 +0000 (09:22 +0000)
commit26781cd2c5165e44842d6a2bba49e15e705e1171
tree32205f2102c43670aef32628ae4b9bca172d5409
parent5a955dfc89b221d5db8aea7aec14d20843f7a8c6
parentd242c10c6f2b9c9538d7c0640c96f4efd0bd92cc
Merge "Do not override odlparent properties"

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.