Combine pkg/apitools and pkg/api/common and call the result pkg/runtime

pkg/tools/decoder_test.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/common"
 	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 )
 
@@ -36,7 +36,7 @@ func TestDecoder(t *testing.T) {
 
 	expect := &api.Pod{JSONBase: api.JSONBase{ID: "foo"}}
 	go func() {
-		err := encoder.Encode(api.WatchEvent{watch.Added, common.Object{expect}})
+		err := encoder.Encode(api.WatchEvent{watch.Added, runtime.Object{expect}})
 		if err != nil {
 			t.Errorf("Unexpected error %v", err)
 		}