Skip to content

Commit

Permalink
Resolving merge conflict with Azure
Browse files Browse the repository at this point in the history
  • Loading branch information
@anand-kumar-subramanian
anand-kumar-subramanian committed Nov 26, 2019
1 parent de94601 commit ce4dd34
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions dockers/docker-sonic-telemetry/telemetry.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,4 @@ else
TELEMETRY_ARGS+=" -v=2"
fi

cd /usr/sbin
exec telemetry ${TELEMETRY_ARGS}
exec /usr/sbin/telemetry ${TELEMETRY_ARGS}

1 comment on commit ce4dd34

@seiferteric
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break telemetry since translib expects schema directory to be in the CWD.

Please sign in to comment.