Merge "Remove the need for mvn33 defaults"

author Ed Warnicke <hagbard@gmail.com>

Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)

committer Gerrit Code Review <gerrit@fd.io>

Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)
author Ed Warnicke <hagbard@gmail.com>
Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)
committer Gerrit Code Review <gerrit@fd.io>
Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)
diff --cc jjb/honeycomb/honeycomb.yaml
Simple merge
diff --cc jjb/vpp/vpp.yaml
Simple merge
author	Ed Warnicke <hagbard@gmail.com>
	Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)
committer	Gerrit Code Review <gerrit@fd.io>
	Mon, 17 Oct 2016 17:56:36 +0000 (17:56 +0000)
		1	2
jjb/honeycomb/honeycomb.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/vpp/vpp.yaml	patch \|	diff1 \|	diff2 \|	blob \| history