From 0c58d536e01df9d2a5c9a3986686c988cf467baa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 28 Mar 2013 01:19:58 -0400
Subject: [PATCH] fixing merge issue

---
 .../EntryPoints/WebSocketEvents.cs                          | 6 +++---
 Nuget/MediaBrowser.Common.Internal.nuspec                   | 4 ++--
 Nuget/MediaBrowser.Common.nuspec                            | 2 +-
 Nuget/MediaBrowser.Server.Core.nuspec                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
index 2ee3193dc9..50d625739b 100644
--- a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
+++ b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
@@ -88,13 +88,13 @@ namespace MediaBrowser.ServerApplication.EntryPoints
 
         void _taskManager_TaskCompleted(object sender, GenericEventArgs<TaskResult> e)
         {
-            _serverManager.SendWebSocketMessage("ScheduledTaskEndExecute", e.Argument);
+            _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument);
         }
 
         void _taskManager_TaskExecuting(object sender, EventArgs e)
         {
             var task = (IScheduledTask) sender;
-            _serverManager.SendWebSocketMessage("ScheduledTaskBeginExecute", task.Name);
+            _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name);
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints
         /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
         void kernel_HasPendingRestartChanged(object sender, EventArgs e)
         {
-            _serverManager.SendWebSocketMessage("HasPendingRestartChanged", _appHost.GetSystemInfo());
+            _serverManager.SendWebSocketMessage("RestartRequired", _appHost.GetSystemInfo());
         }
 
         /// <summary>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 19b811fe98..fbbddc5f31 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.61</version>
+        <version>3.0.62</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.61" />
+            <dependency id="MediaBrowser.Common" version="3.0.62" />
             <dependency id="NLog" version="2.0.0.2000" />
             <dependency id="ServiceStack.Text" version="3.9.38" />
             <dependency id="protobuf-net" version="2.0.0.621" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 78a4fbbad3..34c9463da3 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.61</version>
+        <version>3.0.62</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 4a9693e7fe..0d554fb46f 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.61</version>
+        <version>3.0.62</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.61" />
+            <dependency id="MediaBrowser.Common" version="3.0.62" />
         </dependencies>
     </metadata>
     <files>