From 2e91fdd2fdeb65f391b55dfa7781b6f6faa5d1e7 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 7 Apr 2015 13:33:54 -0700
Subject: [PATCH] Fixup merge mistakes

---
 pkg/api/types.go              | 5 +++++
 pkg/api/v1beta1/conversion.go | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/api/types.go b/pkg/api/types.go
index 87facbb9d71..4ffd694e134 100644
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -390,6 +390,11 @@ type ISCSIVolumeSource struct {
 	IQN string `json:"iqn,omitempty"`
 	// Required: iSCSI target lun number
 	Lun int `json:"lun,omitempty"`
+	// Required: Filesystem type to mount.
+	// Must be a filesystem type supported by the host operating system.
+	// Ex. "ext4", "xfs", "ntfs"
+	// TODO: how do we prevent errors in the filesystem from compromising the machine
+	FSType string `json:"fsType,omitempty"`
 	// Optional: Defaults to false (read/write). ReadOnly here will force
 	// the ReadOnly setting in VolumeMounts.
 	ReadOnly bool `json:"readOnly,omitempty"`
diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go
index 320d4634863..acce5370a1f 100644
--- a/pkg/api/v1beta1/conversion.go
+++ b/pkg/api/v1beta1/conversion.go
@@ -1197,11 +1197,10 @@ func init() {
 			if err := s.Convert(&in.GCEPersistentDisk, &out.GCEPersistentDisk, 0); err != nil {
 				return err
 			}
-<<<<<<< HEAD
 			if err := s.Convert(&in.ISCSI, &out.ISCSI, 0); err != nil {
-=======
+				return err
+			}
 			if err := s.Convert(&in.AWSPersistentDisk, &out.AWSPersistentDisk, 0); err != nil {
->>>>>>> Add initial support for Volumes to AWS
 				return err
 			}
 			if err := s.Convert(&in.HostDir, &out.HostPath, 0); err != nil {