Merge pull request #2815 from MediaBrowser/beta

Beta

4 files changed, 2 insertions, 13 deletions

diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index f0e262c501..eb153427c7 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -105,12 +105,9 @@ namespace MediaBrowser.Model.Sync
         public string PrimaryImageItemId { get; set; }
         public string PrimaryImageTag { get; set; }
 
-        public bool EnableAutomaticResync { get; set; }
-
         public SyncJob()
         {
             RequestedItemIds = new List<string>();
-            EnableAutomaticResync = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobItem.cs b/MediaBrowser.Model/Sync/SyncJobItem.cs
index 1c72ccd523..9fb275823a 100644
--- a/MediaBrowser.Model/Sync/SyncJobItem.cs
+++ b/MediaBrowser.Model/Sync/SyncJobItem.cs
@@ -92,11 +92,6 @@ namespace MediaBrowser.Model.Sync
         /// <value>The additional files.</value>
         public List<ItemFileInfo> AdditionalFiles { get; set; }
         /// <summary>
-        /// Gets or sets a value indicating whether this instance is marked for removal.
-        /// </summary>
-        /// <value><c>true</c> if this instance is marked for removal; otherwise, <c>false</c>.</value>
-        public bool IsMarkedForRemoval { get; set; }
-        /// <summary>
         /// Gets or sets the index of the job item.
         /// </summary>
         /// <value>The index of the job item.</value>
diff --git a/MediaBrowser.Model/Sync/SyncJobItemStatus.cs b/MediaBrowser.Model/Sync/SyncJobItemStatus.cs
index c4e23c63cd..2a968869f0 100644
--- a/MediaBrowser.Model/Sync/SyncJobItemStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobItemStatus.cs
@@ -8,8 +8,6 @@ namespace MediaBrowser.Model.Sync
         ReadyToTransfer = 2,
         Transferring = 3,
         Synced = 4,
-        RemovedFromDevice = 5,
-        Failed = 6,
-        Cancelled = 7
+        Failed = 5
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index ac211a32a7..2d1d30802b 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -9,7 +9,6 @@ namespace MediaBrowser.Model.Sync
         Transferring = 3,
         Completed = 4,
         CompletedWithError = 5,
-        Failed = 6,
-        Cancelled = 7
+        Failed = 6
     }
 }