From 1b64982e2741ba3d793d085039b02de9a731a2e1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 4 Mar 2016 17:38:51 +0100
Subject: Automatically enable "federation" app

---
 apps/federation/appinfo/info.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index e4a274c6425..3bd66e2954a 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
 <info>
-    <id>federation</id>
-    <name>Federation</name>
-    <description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
-    <licence>AGPL</licence>
-    <author>Bjoern Schiessle</author>
-    <version>0.1.0</version>
-    <namespace>Federation</namespace>
-    <category>other</category>
+	<id>federation</id>
+	<name>Federation</name>
+	<description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
+	<licence>AGPL</licence>
+	<author>Bjoern Schiessle</author>
+	<version>0.1.0</version>
+	<namespace>Federation</namespace>
+	<category>other</category>
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
-    <types>
-        <authentication/>
-    </types>
+	<default_enable/>
+	<types>
+		<authentication/>
+	</types>
 </info>
-- 
cgit v1.2.3


From 947720b8007623bc1e68f7f41c251cdbeb791830 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 4 Mar 2016 17:59:57 +0100
Subject: Adjust OCS test

---
 build/integration/features/provisioning-v1.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 04a706f387b..8c32c04523c 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -285,6 +285,7 @@ Feature: provisioning
 			| comments |
 			| dav |
 			| federatedfilesharing |
+			| federation |
 			| files |
 			| files_sharing |
 			| files_trashbin |
-- 
cgit v1.2.3