From d9ad8cfac0fbc759cfabda1ec671d738ca1f1f12 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Fri, 12 Dec 2014 17:16:18 -0500
Subject: [PATCH] Conversions missing from v1beta1

They were in v1beta2, not sure how they got removed.
---
 pkg/api/v1beta1/conversion.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go
index 10614a4e23a..3116c159f66 100644
--- a/pkg/api/v1beta1/conversion.go
+++ b/pkg/api/v1beta1/conversion.go
@@ -196,6 +196,18 @@ func init() {
 			out.PodIP = in.PodIP
 			return nil
 		},
+		func(in *newer.PodSpec, out *PodState, s conversion.Scope) error {
+			if err := s.Convert(&in, &out.Manifest, 0); err != nil {
+				return err
+			}
+			return nil
+		},
+		func(in *PodState, out *newer.PodSpec, s conversion.Scope) error {
+			if err := s.Convert(&in.Manifest, &out, 0); err != nil {
+				return err
+			}
+			return nil
+		},
 
 		// Convert all to the new PodPhase constants
 		func(in *newer.PodPhase, out *PodStatus, s conversion.Scope) error {