- Fixed conflict. - Added a warning related to the private registry name. Signed-off-by: Elaine Fonaro <elaine.fonaro@windriver.com> Change-Id: I81d0ac6df23a12cb5d4004b63c096019ebf136f7 (cherry picked from commit 0ca93e2576)
0ca93e2576