tree ce397995c2fd61e755ea026ed606d2b7c00ea762
parent 66eef76923491fac5bd44f93251d57a8195355c0
author Zack Williams <zdw@opennetworking.org> 1525739745 -0700
committer Zack Williams <zdw@opennetworking.org> 1525789296 -0700

Fix issues with helm job, and use normal git choosing-strategy when
working with merges

Change-Id: I1560c965649441c0a4c885efb346368a5f2b2a28