From 6cdec4c0935ae3221c1c5bcc34b084f6d73a1f57 Mon Sep 17 00:00:00 2001
From: markturansky <mturansk@redhat.com>
Date: Thu, 7 May 2015 18:14:43 -0400
Subject: [PATCH] rebased and updated

---
 pkg/api/v1beta3/conversion_generated.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkg/api/v1beta3/conversion_generated.go b/pkg/api/v1beta3/conversion_generated.go
index 9086345e26..700dfa16c5 100644
--- a/pkg/api/v1beta3/conversion_generated.go
+++ b/pkg/api/v1beta3/conversion_generated.go
@@ -2245,6 +2245,14 @@ func convert_v1beta3_PersistentVolumeSource_To_api_PersistentVolumeSource(in *Pe
 	} else {
 		out.HostPath = nil
 	}
+	if in.ISCSI != nil {
+		out.ISCSI = new(newer.ISCSIVolumeSource)
+		if err := convert_v1beta3_ISCSIVolumeSource_To_api_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil {
+			return err
+		}
+	} else {
+		out.ISCSI = nil
+	}
 	if in.Glusterfs != nil {
 		out.Glusterfs = new(newer.GlusterfsVolumeSource)
 		if err := convert_v1beta3_GlusterfsVolumeSource_To_api_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil {
@@ -2292,6 +2300,14 @@ func convert_api_PersistentVolumeSource_To_v1beta3_PersistentVolumeSource(in *ne
 	} else {
 		out.HostPath = nil
 	}
+	if in.ISCSI != nil {
+		out.ISCSI = new(ISCSIVolumeSource)
+		if err := convert_api_ISCSIVolumeSource_To_v1beta3_ISCSIVolumeSource(in.ISCSI, out.ISCSI, s); err != nil {
+			return err
+		}
+	} else {
+		out.ISCSI = nil
+	}
 	if in.Glusterfs != nil {
 		out.Glusterfs = new(GlusterfsVolumeSource)
 		if err := convert_api_GlusterfsVolumeSource_To_v1beta3_GlusterfsVolumeSource(in.Glusterfs, out.Glusterfs, s); err != nil {