Add conflicts with, node_version only works on the default node pool#4762

Merged

slevenick merged 2 commits intoGoogleCloudPlatform:masterfrom slevenick:gke-node-version-conflict

May 6, 2021

+9

Commits on May 4, 2021

Add conflicts with, node_version only works on the default node pool
slevenick
committed

Commits on May 5, 2021

Use customizediff rather than conflicts with
slevenick
committed