Skip to content

Commit 4a908e0

Browse files
Merge pull request #18591 from mfojtik/move-apps-prune
Automatic merge from submit-queue (batch tested with PRs 18591, 18508). move pkg/apps/prune to pkg/oc Pruning is only used by oc adm prune so it logically belongs to `pkg/oc`. @deads2k @tnozicka clean move.
2 parents 5b73b36 + fdf49e7 commit 4a908e0

File tree

8 files changed

+1
-2
lines changed

8 files changed

+1
-2
lines changed

hack/import-restrictions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@
452452
"github.com/openshift/origin/pkg/apps/apis/apps/test",
453453
"github.com/openshift/origin/pkg/apps/client/internalversion",
454454
"github.com/openshift/origin/pkg/apps/client/v1",
455-
"github.com/openshift/origin/pkg/apps/prune",
456455
"github.com/openshift/origin/pkg/apps/registry/deployconfig",
457456
"github.com/openshift/origin/pkg/apps/util",
458457
"github.com/openshift/origin/pkg/authorization/apis/authorization",

pkg/oc/admin/prune/deployments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
1919
appsclientinternal "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
20-
"github.com/openshift/origin/pkg/apps/prune"
20+
"github.com/openshift/origin/pkg/oc/cli/deploymentconfigs/prune"
2121
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2222
)
2323

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)