From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 30 May 2013 22:27:01 +0000 (+0200)
Subject: Preparing update 2.0.0 Beta 2
X-Git-Tag: 2.0.0_Beta_2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a38448c27974ba8e65ba6b26d4ee44b60080e0b;p=GitHub%2FWoltLab%2FWCF.git

Preparing update 2.0.0 Beta 2
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 05b0ca0cb5..9d6a4f5dcc 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1065,4 +1065,8 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 			<!-- /message.general.poll -->
 		</options>
 	</import>
+	
+	<delete>
+		<option name="cache_source_memcached_use_pconnect" />
+	</delete>
 </data>
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 3b4edcda28..d0ebf3bd8f 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.0.0 Beta 1</version> <!-- codename: maelstrom -->
-		<date>2013-05-29</date>
+		<version>2.0.0 Beta 2</version> <!-- codename: maelstrom -->
+		<date>2013-06-01</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -41,4 +41,10 @@
 		<instruction type="aclOption">aclOption.xml</instruction>
 		<instruction type="script">acp/post_install.php</instruction> 
 	</instructions>
+	
+	<instructions type="update" fromversion="2.0.0 Beta 1">
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="option">option.xml</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
 </package>