From 0149ca4974d0ff06cd5a04f054b1fd7446ac7043 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 5 Jan 2015 09:18:12 +1300
Subject: [PATCH] Submodules use master branch
---
.gitmodules | 55 ++++++++++++++++++++++--------------------
plugins/QueuedTracking | 2 +-
2 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index d368c059cb..6e3e46ab64 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,34 +1,34 @@
[submodule "plugins/PleineLune"]
- path = plugins/PleineLune
- url = https://github.com/piwik/theme-PleineLune.git
- branch = master
+ path = plugins/PleineLune
+ url = https://github.com/piwik/theme-PleineLune.git
+ branch = master
[submodule "plugins/SecurityInfo"]
- path = plugins/SecurityInfo
- url = https://github.com/piwik/plugin-SecurityInfo.git
- branch = master
+ path = plugins/SecurityInfo
+ url = https://github.com/piwik/plugin-SecurityInfo.git
+ branch = master
[submodule "plugins/TreemapVisualization"]
- path = plugins/TreemapVisualization
- url = https://github.com/piwik/plugin-TreemapVisualization.git
- branch = master
+ path = plugins/TreemapVisualization
+ url = https://github.com/piwik/plugin-TreemapVisualization.git
+ branch = master
[submodule "plugins/VisitorGenerator"]
- path = plugins/VisitorGenerator
- url = https://github.com/piwik/plugin-VisitorGenerator.git
- branch = master
+ path = plugins/VisitorGenerator
+ url = https://github.com/piwik/plugin-VisitorGenerator.git
+ branch = master
[submodule "tests/PHPUnit/UI"]
- path = tests/PHPUnit/UI
- url = https://github.com/piwik/piwik-ui-tests.git
- branch = master
+ path = tests/PHPUnit/UI
+ url = https://github.com/piwik/piwik-ui-tests.git
+ branch = master
[submodule "plugins/CustomAlerts"]
- path = plugins/CustomAlerts
- url = https://github.com/piwik/plugin-CustomAlerts.git
- branch = master
+ path = plugins/CustomAlerts
+ url = https://github.com/piwik/plugin-CustomAlerts.git
+ branch = master
[submodule "plugins/TasksTimetable"]
- path = plugins/TasksTimetable
- url = https://github.com/piwik/plugin-TasksTimetable.git
+ path = plugins/TasksTimetable
+ url = https://github.com/piwik/plugin-TasksTimetable.git
branch = master
[submodule "plugins/LoginHttpAuth"]
- path = plugins/LoginHttpAuth
- url = https://github.com/piwik/plugin-LoginHttpAuth.git
+ path = plugins/LoginHttpAuth
+ url = https://github.com/piwik/plugin-LoginHttpAuth.git
branch = master
# Note: when you add a submodule that SHOULD be left in the packaged release such as the few submodules below,
@@ -36,8 +36,11 @@
# https://github.com/piwik/piwik-package/blob/master/scripts/build-package.sh
[submodule "plugins/QueuedTracking"]
- path = plugins/QueuedTracking
- url = https://github.com/piwik/plugin-QueuedTracking.git
+ path = plugins/QueuedTracking
+ url = https://github.com/piwik/plugin-QueuedTracking.git
+ branch = master
+
[submodule "libs/PiwikTracker"]
- path = libs/PiwikTracker
- url = https://github.com/piwik/piwik-php-tracker.git
+ path = libs/PiwikTracker
+ url = https://github.com/piwik/piwik-php-tracker.git
+ branch = master
\ No newline at end of file
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
index d6ca138f84..98d41b2332 160000
--- a/plugins/QueuedTracking
+++ b/plugins/QueuedTracking
@@ -1 +1 @@
-Subproject commit d6ca138f84f7dcf6fb4d77b7aa5e0d685ca276dd
+Subproject commit 98d41b2332f0c7c914a4ca5c33ad5cc074ca4dbb
--
GitLab