Code Review / ovsdb.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(merge: d51c465 92edcb1)
Merge branch 'master' into topic/netvirtsb2 15/19115/1
authorSam Hague <shague@redhat.com>
Sun, 26 Apr 2015 19:27:25 +0000 (15:27 -0400)
committerSam Hague <shague@redhat.com>
Sun, 26 Apr 2015 19:28:32 +0000 (15:28 -0400)
commit0c540e87e2fed3b1671be8b7461e560d6be3734b
tree2d888218eadbdb06575e301506d3c21e4cc8fc07tree | snapshot
parentd51c465d6fab5e2980f8fe2ca44795ce1e67ea0dcommit | diff
parent92edcb18fb7be442c7abf1d5e2cb769df7a58099commit | diff
Merge branch 'master' into topic/netvirtsb2

Signed-off-by: Sam Hague <shague@redhat.com>
Conflicts:
openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java

Signed-off-by: Sam Hague <shague@redhat.com>
Change-Id: I75654ecea55d84cd022b856e2b0a30a1144a6f05
Signed-off-by: Sam Hague <shague@redhat.com>
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java diff1 | diff2 | blob | history
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java diff1 | diff2 | blob | history
openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java diff1 | diff2 | blob | history
openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandlerTest.java diff1 | diff2 | blob | history
southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java diff1 | diff2 | blob | history
Open vSwitch Database Management Protocol