Merge "OPNFLWPLUG-1062 Include additional LLDP fields in liblldp"

author Anil Vishnoi <vishnoianil@gmail.com>

Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)
author Anil Vishnoi <vishnoianil@gmail.com>
Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)
diff --cc libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDP.java
Simple merge
diff --cc libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java
Simple merge
author	Anil Vishnoi <vishnoianil@gmail.com>
	Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Wed, 1 May 2019 20:14:47 +0000 (20:14 +0000)
		1	2
libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDP.java	patch \|	diff1 \|	diff2 \|	blob \| history
libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java	patch \|	diff1 \|	diff2 \|	blob \| history