Preserve int64 data when patching

2015-11-06 23:13:17 -05:00
parent fbe5f70267
commit 37c86041ca
8 changed files with 626 additions and 4 deletions
--- a/pkg/util/strategicpatch/patch.go
+++ b/pkg/util/strategicpatch/patch.go
@@ -17,11 +17,11 @@ limitations under the License.
 package strategicpatch

 import (
-	"encoding/json"
 	"fmt"
 	"reflect"
 	"sort"

+	"k8s.io/kubernetes/pkg/util/json"
 	forkedjson "k8s.io/kubernetes/third_party/forked/json"

 	"github.com/davecgh/go-spew/spew"