From: Alessandro Boch <aboch@cisco.com>
Date: Tue, 7 Jan 2014 22:50:12 +0000 (+0000)
Subject: Merge changes I7e42fc60,I6a7335b4,Ie11ee943,Ic48123a3,I89b6349e,I23a09513,Ibe5395dd... 
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~133
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6397a0f2a8b4e0aecb7c42f589d17cd7511827c3;hp=--cc

Merge changes I7e42fc60,I6a7335b4,Ie11ee943,Ic48123a3,I89b6349e,I23a09513,Ibe5395dd,If05e0412,I19f17f97,I6f4beab1,I678c46d9

* changes:
  Added WADL generation for Models
  Fix for Bug 271
  Add a flow by adding the flow data into the datastore
  Set Node on the AddFlowInput and RemoveFlowInput
  Fixed Topology Adapter to properly add Edge Properties
  Removed dead code in LLDPDiscoveryUtil
  Fixed two small FlowAdapter bugs.
  Fixed implementation of getNodeConnectorProps and getNodeProps
  Check for null srcNodeId and srcNodeConnectorId
  Fixed Node Properties in Adapter - with exceptions noted below
  Fixed adapter handling of Special Node Connectors
---

6397a0f2a8b4e0aecb7c42f589d17cd7511827c3