From: Milos Fabian <milfabia@cisco.com>
Date: Mon, 9 Dec 2013 14:27:45 +0000 (+0100)
Subject: Added conflict handling between configuration and state choice nodes.
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~224^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=7d402c78624fbd9968ad6e1f6295527dbc387821;hp=7d402c78624fbd9968ad6e1f6295527dbc387821

Added conflict handling between configuration and state choice nodes.
-unique node naming required

Change-Id: I7db0a094d8abbd4c1616b6a01a22ac201e91ad64
Signed-off-by: Milos Fabian <milfabia@cisco.com>
---