Merge "Add "direct" option for logging to console."

author Tim Rozet <trozet@redhat.com>

Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)
author Tim Rozet <trozet@redhat.com>
Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)
diff --cc manifests/config.pp
Simple merge
diff --cc spec/spec_helper.rb
Simple merge
diff --cc spec/spec_helper_acceptance.rb
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Mon, 18 Jun 2018 13:28:22 +0000 (13:28 +0000)
		1	2
manifests/config.pp	patch \|	diff1 \|	diff2 \|	blob \| history
spec/spec_helper.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/spec_helper_acceptance.rb	patch \|	diff1 \|	diff2 \|	blob \| history