tree 6d1585abe7c2effe8239c0f8d59fa922c54df40e
parent 002258f0253e45978e4d342f5eade4349dd196e3
parent 56cb6f239230451b6dda290f15ffe3513078fbff
author slowr <dimitris@opennetworking.org> 1516134580 +0200
committer slowr <dimitris@opennetworking.org> 1516134580 +0200

Merge branch 'master' of ssh://gerrit.opencord.org:29418/fpcagent

Conflicts:
	apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/JettyServer.java
	apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java