Merge branch 'master' into topic/schema 76/8376/1
authorDave Tucker <djt@redhat.com>
Thu, 26 Jun 2014 15:48:38 +0000 (16:48 +0100)
committerDave Tucker <djt@redhat.com>
Thu, 26 Jun 2014 15:51:35 +0000 (16:51 +0100)
commitbc1d1f404885c716e92304bd87f943f377987773
tree39afb7f9d6a619f3b28659e921971e7fe54be0eb
parent394df01d53c4218cef09a98b814eebe46a80ed83
parentcf830cb33148a84f97b6aec68eae521b39bcd7e9
Merge branch 'master' into topic/schema

Change-Id: I4fb484be5b48297a3af4f2b41762e5971f9cc980
Signed-off-by: Dave Tucker <djt@redhat.com>
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java