merge master into api-migration

1 files changed, 0 insertions, 30 deletions

diff --git a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
index 07ca2b58b..6db1f1364 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Common.Configuration
@@ -15,33 +14,4 @@ namespace MediaBrowser.Common.Configuration
         /// <returns>The configuration store.</returns>
         IEnumerable<ConfigurationStore> GetConfigurations();
     }
-
-    /// <summary>
-    /// Describes a single entry in the application configuration.
-    /// </summary>
-    public class ConfigurationStore
-    {
-        /// <summary>
-        /// Gets or sets the unique identifier for the configuration.
-        /// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type used to store the data for this configuration entry.
-        /// </summary>
-        public Type ConfigurationType { get; set; }
-    }
-
-    /// <summary>
-    /// A configuration store that can be validated.
-    /// </summary>
-    public interface IValidatingConfiguration
-    {
-        /// <summary>
-        /// Validation method to be invoked before saving the configuration.
-        /// </summary>
-        /// <param name="oldConfig">The old configuration.</param>
-        /// <param name="newConfig">The new configuration.</param>
-        void Validate(object oldConfig, object newConfig);
-    }
 }