From fc3ee3fa79490a772c7dc7f73c72742388fa0a53 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Thu, 28 May 2015 22:23:00 +0930
Subject: [PATCH] v10.11 ready for merge.

---
 changelog.txt    | 15 +++++++++++++++
 core/__init__.py |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 9942d550..1497ab20 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,20 @@
 Change_LOG / History
 
+V10.11 28/05/2015
+
+Use socket to verify if running on Linux. Prevents issues with stale pid.
+Add timeouts and improve single instance handling.
+Prevent Scale Up.
+Improve regex for rename script.
+Improve safe rename functionality.
+Ignore .bts extensions.
+Don't process output when no transcoding needed.
+Ignore Thumbs.db on manual run.
+Rename nzbtomedia to core. To prevent erros on non-case sensitive file systems.
+Mark as bad if no media files found.
+Increase server responding timeout.
+Don't use last modified entry for CP renamer when no imdb id found.
+Add plex library update.
 
 V10.10 29/01/2015
 
diff --git a/core/__init__.py b/core/__init__.py
index 55bb6d8d..900fa9eb 100644
--- a/core/__init__.py
+++ b/core/__init__.py
@@ -288,7 +288,7 @@ def initialize(section=None):
     nzbToMediaDB.upgradeDatabase(nzbToMediaDB.DBConnection(), mainDB.InitialSchema)
 
     # Set Version and GIT variables
-    NZBTOMEDIA_VERSION = '10.10'
+    NZBTOMEDIA_VERSION = '10.11'
     VERSION_NOTIFY = int(CFG['General']['version_notify'])
     AUTO_UPDATE = int(CFG['General']['auto_update'])
     GIT_REPO = 'nzbToMedia'