From 2dc9d1cab6179b92fa10052436f205e16bd5c443 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 25 Jan 2017 16:26:04 +0100 Subject: [PATCH] third_party/forked/golang/json: move to k8s.io/apimachinery --- .../src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go | 2 +- .../k8s.io/apimachinery/third_party}/forked/golang/json/BUILD | 0 .../apimachinery/third_party}/forked/golang/json/fields.go | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {third_party => staging/src/k8s.io/apimachinery/third_party}/forked/golang/json/BUILD (100%) rename {third_party => staging/src/k8s.io/apimachinery/third_party}/forked/golang/json/fields.go (100%) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go index fe8f2c33818..b9124b322e6 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go @@ -23,7 +23,7 @@ import ( "strings" "k8s.io/apimachinery/pkg/util/json" - forkedjson "k8s.io/kubernetes/third_party/forked/golang/json" + forkedjson "k8s.io/apimachinery/third_party/forked/golang/json" "github.com/davecgh/go-spew/spew" "github.com/ghodss/yaml" diff --git a/third_party/forked/golang/json/BUILD b/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD similarity index 100% rename from third_party/forked/golang/json/BUILD rename to staging/src/k8s.io/apimachinery/third_party/forked/golang/json/BUILD diff --git a/third_party/forked/golang/json/fields.go b/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go similarity index 100% rename from third_party/forked/golang/json/fields.go rename to staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go