tree 282c63a1e75f43fabb2ef90150578fe8069fc7ce
parent fee32e4d1c59cf4872308d01e6166479f58f6078
parent 02cbf99dc2b0960d0c6a1a2650cf2b4b0bb63f1f
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