github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-08 14:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17922 from smarterclayton/split_codec

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-25 06:30:39 -08:00
parent 1992fca62d 3262d8efd8
commit d3b869ae14
250 changed files with 5960 additions and 5507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/integration/integration.go
View File

@@ -26,7 +26,7 @@ import (
"net/http/httptest"
"os"
"reflect"
"runtime"
gruntime "runtime"
"strconv"
"strings"
"sync"
@@ -52,6 +52,7 @@ import (
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/master"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
utilnet "k8s.io/kubernetes/pkg/util/net"
"k8s.io/kubernetes/pkg/util/sets"
@@ -444,7 +445,7 @@ func runReplicationControllerTest(c *client.Client) {
glog.Infof("Done reading config file, took %v", time.Since(t))
t = time.Now()
var controller api.ReplicationController
if err := api.Scheme.DecodeInto(data, &controller); err != nil {
if err := runtime.DecodeInto(testapi.Default.Codec(), data, &controller); err != nil {
glog.Fatalf("Unexpected error: %v", err)
}
@@ -958,7 +959,7 @@ func addFlags(fs *pflag.FlagSet) {
}
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
gruntime.GOMAXPROCS(gruntime.NumCPU())
addFlags(pflag.CommandLine)
util.InitFlags()