Reviewed: https://review.opencontrail.org/12833 Committed: http://github.org/Juniper/contrail-provisioning/commit/6a78f9823668d3d6a98895a7f67b6ca09fdd55d9 Submitter: Zuul Branch: R2.20
commit 6a78f9823668d3d6a98895a7f67b6ca09fdd55d9 Author: Ranjeet R <email address hidden> Date: Tue Aug 4 11:21:09 2015 -0700
Fixes: Merge issues for bug 1471596
While merging with add_new_controller feature, the code was reorganized and hence there is a merge issue with bug 1471596. Fixing the merge issue.
Change-Id: I628a51343a615bac308defeb987fdc4785103cde ClosesBug: 1471596
Reviewed: https:/ /review. opencontrail. org/12833 github. org/Juniper/ contrail- provisioning/ commit/ 6a78f9823668d3d 6a98895a7f67b6c a09fdd55d9
Committed: http://
Submitter: Zuul
Branch: R2.20
commit 6a78f9823668d3d 6a98895a7f67b6c a09fdd55d9
Author: Ranjeet R <email address hidden>
Date: Tue Aug 4 11:21:09 2015 -0700
Fixes: Merge issues for bug 1471596
While merging with add_new_controller feature, the code was
reorganized and hence there is a merge issue with bug 1471596.
Fixing the merge issue.
Change-Id: I628a51343a615b ac308defeb987fd c4785103cde
ClosesBug: 1471596