tree 8d80e9f3a93a63d4a5644dea939d1e6e33ff9dda
parent 70abce19620c1f4f63b0454789e85a8a6e7adec3
parent d1eeb15c097910ab7c5c980056ad37137ec157bf
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1463187042 -0600
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> 1463187042 -0600

Merge branch 'acord_post_ons_fixes' of https://github.com/open-cloud/xos into acord_post_ons_fixes

Conflicts:
	xos/configurations/acord/acord-exampleservice.yaml
	xos/synchronizers/monitoring_channel/steps/sync_monitoringchannel.yaml