Merge "Bug 4988: OF statistics & REST client"

author Martin Sunal <msunal@cisco.com>

Wed, 24 Feb 2016 15:56:39 +0000 (15:56 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Wed, 24 Feb 2016 15:56:40 +0000 (15:56 +0000)
author Martin Sunal <msunal@cisco.com>
Wed, 24 Feb 2016 15:56:39 +0000 (15:56 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Wed, 24 Feb 2016 15:56:40 +0000 (15:56 +0000)
diff --cc demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py

index 722f6b589c9e07d69554510e95e36e1941ed1080,41264d665b54cc4a1149e7027c6548338659b10c..41264d665b54cc4a1149e7027c6548338659b10c

mode 100755,100644..100755
--- 1/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
--- 2/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
+++ b/demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py
diff --cc demos/gbpsfc-env/demo-symmetric-coexistence/rest.py

index c8caa10096e8e4bb7ddcd5dd2a5dfef623acf07a,2884d76a0e900d9a52638f44215347220c9c3e99..2884d76a0e900d9a52638f44215347220c9c3e99

mode 100755,100644..100755
--- 1/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
--- 2/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
+++ b/demos/gbpsfc-env/demo-symmetric-coexistence/rest.py
author	Martin Sunal <msunal@cisco.com>
	Wed, 24 Feb 2016 15:56:39 +0000 (15:56 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Wed, 24 Feb 2016 15:56:40 +0000 (15:56 +0000)
		1	2
demos/gbpsfc-env/demo-asymmetric-coexistence/rest.py	patch \|	diff1 \|	diff2 \|	blob \| history
demos/gbpsfc-env/demo-symmetric-coexistence/rest.py	patch \|	diff1 \|	diff2 \|	blob \| history