Merge pull request #196 from lavalamp/marshal

Make api able to marshal its types correctly

pkg/cloudcfg/parse_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cloudcfg
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -32,7 +31,7 @@ func TestParseBadStorage(t *testing.T) {
 }
 
 func DoParseTest(t *testing.T, storage string, obj interface{}) {
-	json_data, _ := json.Marshal(obj)
+	json_data, _ := api.Encode(obj)
 	yaml_data, _ := yaml.Marshal(obj)
 	t.Logf("Intermediate yaml:\n%v\n", string(yaml_data))