Merge "Add boolean flag to disable the PaxOsgi appender"

author Tim Rozet <trozet@redhat.com>

Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)
author Tim Rozet <trozet@redhat.com>
Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)
diff --cc README.markdown
Simple merge
diff --cc manifests/params.pp
Simple merge
diff --cc spec/classes/opendaylight_spec.rb
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>
	Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Fri, 14 Dec 2018 21:50:28 +0000 (21:50 +0000)
		1	2
README.markdown	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/params.pp	patch \|	diff1 \|	diff2 \|	blob \| history
spec/classes/opendaylight_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/spec_helper.rb	patch \|	diff1 \|	diff2 \|	blob \| history
spec/spec_helper_acceptance.rb	patch \|	diff1 \|	diff2 \|	blob \| history