Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Conflicts:
	MediaBrowser.Server.Implementations/Localization/Server/server.json

1 files changed, 0 insertions, 10 deletions

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
index 77b993205..075ef4239 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs
@@ -32,8 +32,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _logger = logManager.GetLogger(GetType().Name);
         }
 
-        private SqliteShrinkMemoryTimer _shrinkMemoryTimer;
-
         /// <summary>
         /// Opens the connection to the database
         /// </summary>
@@ -54,8 +52,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.RunQueries(queries, _logger);
 
             PrepareStatements();
-
-            _shrinkMemoryTimer = new SqliteShrinkMemoryTimer(_connection, _writeLock, _logger);
         }
 
         /// <summary>
@@ -286,12 +282,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 {
                     lock (_disposeLock)
                     {
-                        if (_shrinkMemoryTimer != null)
-                        {
-                            _shrinkMemoryTimer.Dispose();
-                            _shrinkMemoryTimer = null;
-                        }
-
                         if (_connection != null)
                         {
                             if (_connection.IsOpen())