Merge "Bug 5117 - More bad file formats and chmod breaks"

author Martin Sunal <msunal@cisco.com>

Wed, 24 Feb 2016 15:06:18 +0000 (15:06 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

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

index 722f6b589c9e07d69554510e95e36e1941ed1080,530a9345a81d56571d08d71f10c8349bdf37e28e..722f6b589c9e07d69554510e95e36e1941ed1080

mode 100644,100755..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,6b99f6dfff3ce19ceeffbe6a5d0ad09022f6a790..c8caa10096e8e4bb7ddcd5dd2a5dfef623acf07a

mode 100644,100755..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:06:18 +0000 (15:06 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Wed, 24 Feb 2016 15:06:18 +0000 (15:06 +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