Merge pull request #20333 from juanvallejo/jvallejo/update-importimag…

…e-to-externals update import-image cmd to use external versions
openshift · Aug 3, 2018 · 2fa8042 · 2fa8042
2 parents 342837c + 46f4f45
commit 2fa8042
Show file tree

Hide file tree

Showing 6 changed files with 467 additions and 324 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -476,9 +476,9 @@
       "github.com/openshift/origin/pkg/authorization/generated",
       "github.com/openshift/origin/pkg/build/apis/build/v1",
       "github.com/openshift/origin/pkg/build/generated",
-	    "github.com/openshift/origin/pkg/image/apis/image/v1",
+      "github.com/openshift/origin/pkg/image/apis/image/v1",
       "github.com/openshift/origin/pkg/image/generated",
-	    "github.com/openshift/origin/pkg/image/util",
+	  "github.com/openshift/origin/pkg/image/util",
       "github.com/openshift/origin/pkg/network/generated",
       "github.com/openshift/origin/pkg/oauth/generated",
       "github.com/openshift/origin/pkg/project/generated",