Merge branch 'master' into topic/netvirtsbmerge 97/19397/1
authorSam Hague <shague@redhat.com>
Thu, 30 Apr 2015 16:30:01 +0000 (12:30 -0400)
committerSam Hague <shague@redhat.com>
Thu, 30 Apr 2015 16:30:49 +0000 (12:30 -0400)
commit48d4f37d6d1f2583c150393e436079f08af7d9d2
tree4268c15e0dea7b1c537a981b3fe18a3d4ed9a172
parentda5ba20e8732bdebc213ad5fbbb9c871f47013dd
parentf16cf374d5da6786dbd9a47921df4d3cd0a021b0
Merge branch 'master' into topic/netvirtsbmerge

Change-Id: I1da78555e1e5a29f9b195ceedf508fc597a025a5
Signed-off-by: Sam Hague <shague@redhat.com>
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java