Merge "Fix imports for github.com/sirupsen/logrus"

author Rastislav Szabo <raszabo@cisco.com>

Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)

committer Gerrit Code Review <gerrit@fd.io>

Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)
author Rastislav Szabo <raszabo@cisco.com>
Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)
committer Gerrit Code Review <gerrit@fd.io>
Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)
diff --cc core/core.go
Simple merge
diff --cc core/msg_codec.go
Simple merge
author	Rastislav Szabo <raszabo@cisco.com>
	Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)
committer	Gerrit Code Review <gerrit@fd.io>
	Thu, 4 Jan 2018 08:44:00 +0000 (08:44 +0000)
		1	2
core/core.go	patch \|	diff1 \|	diff2 \|	blob \| history
core/msg_codec.go	patch \|	diff1 \|	diff2 \|	blob \| history