Merge branch 'topic/netty' 68/2468/1
authorMadhu Venugopal <mavenugo@gmail.com>
Wed, 6 Nov 2013 22:58:28 +0000 (14:58 -0800)
committerMadhu Venugopal <mavenugo@gmail.com>
Wed, 6 Nov 2013 23:04:14 +0000 (15:04 -0800)
commitc969beda936f2397197a79454bda091c57ffef36
tree21324b28c3e0b46ae7e9b5eb074d80f428df478b
parent2c58aed099a7c7a69fba0ec8917ed14d03d8b5cc
parent9baa647ff11733ed5aba5e4dc0e627659f539e7d
Merge branch 'topic/netty'
Collapsing the branch to master

Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Conflicts:
ovsdb/.classpath
ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java

Change-Id: I4bc7cd4b921b5eb8b14cfe4d1c2811214f03e78c
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfig.java
ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePort.java
ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControler.java