From c567984d57d52e76ea5279bcbafed86b81a4ce56 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 12 Oct 2012 07:32:34 -0400
Subject: [PATCH 1/4] Merge

---
 .../WebsitePanel.EnterpriseServer/Web.config       | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 7d97bfb9..3766094f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,18 +5,12 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <!--
-    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
-    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
-    -->
-    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
+        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-    <!--
-    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-    -->
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
+    <!-- Encryption util settings -->
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
+    <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
     <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />

From c087e5c40ac53fa6f91030987b4a9bd29913fb57 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 12 Oct 2012 07:42:07 -0400
Subject: [PATCH 2/4] Added tag build-2.0.0.102 for changeset a71281794842


From d0bd263bbd6cbbcfff757fedc0bc8cbe5cfa1df5 Mon Sep 17 00:00:00 2001
From: feodor_fitsner <devnull@localhost>
Date: Fri, 12 Oct 2012 09:34:55 -0700
Subject: [PATCH 3/4] MySQL username length policy increased to 40 characters

---
 .../DesktopModules/WebsitePanel/SettingsEditor.ascx.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
index a365da9f..784d7962 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsEditor.ascx.cs
@@ -267,7 +267,7 @@ namespace WebsitePanel.Portal
                             }
                             parts = settings["UserNamePolicy"].Split(';');
 
-                            if (Utils.ParseInt(parts[3]) > 16)
+                            if (Utils.ParseInt(parts[3]) > 40)
                             {
                                 ShowWarningMessage("MySQL_USERNAME_MAX_LENGTH");
                                 return;

From 24c63ffce9946e9c5e86726679ceafa99621b811 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 12 Oct 2012 12:44:17 -0400
Subject: [PATCH 4/4] Added tag build-2.0.0.103 for changeset 7740fbc20c3a