Merge ~michihenning/unity-api-team-jenkins:add-gdrive-provider into unity-api-team-jenkins:master

Proposed by Michi Henning
Status: Merged
Approved by: dobey
Approved revision: aa95b526049efc8ea8c6a2e15f9439baf261b55d
Merge reported by: Michi Henning
Merged at revision: not available
Proposed branch: ~michihenning/unity-api-team-jenkins:add-gdrive-provider
Merge into: unity-api-team-jenkins:master
Diff against target: 30 lines (+4/-1)
1 file modified
unity-api-team.yaml (+4/-1)
Reviewer Review Type Date Requested Status
dobey (community) Approve
Unity API Team Pending
Review via email: mp+314590@code.launchpad.net

Commit message

Added storage-provider-gdrive.

Description of the change

Added storage-provider-gdrive.

To post a comment you must log in.
aa95b52... by Michi Henning

Merge branch 'remove-old-slaves' into add-gdrive-provider

Revision history for this message
dobey (dobey) wrote :

Approved, but I think you need to squash the commits here, as 'remove-old-slaves' is already merged to master, and merging this to master as-is would result in the extra commit showing up and it would look a little weird in history.

review: Approve
Revision history for this message
Michi Henning (michihenning) wrote :

I squashed the commits, thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/unity-api-team.yaml b/unity-api-team.yaml
2index d84a78c..5325fd2 100644
3--- a/unity-api-team.yaml
4+++ b/unity-api-team.yaml
5@@ -26,7 +26,7 @@
6
7 # This needs to be a comma-separated list of quoted LP teams and/or users.
8 allowed_users: |
9- "unity-api-team", "mcloud-team", "onedrive_team"
10+ "unity-api-team", "mcloud-team", "onedrive_team", "gdrive-team"
11
12 # A space-separated list of packages to install on build slaves in addition
13 # to the default list. Use this if, for example, your debian/rules clean
14@@ -132,6 +132,8 @@
15 - policykit-unity8: &policykit-unity8 ''
16 - storage-framework: &storage-framework
17 branch: lp:{project}/devel
18+ - storage-provider-gdrive: &storage-provider-gdrive
19+ branch: lp:{project}/devel
20 - storage-provider-onedrive: &storage-provider-onedrive
21 branch: lp:{project}/devel
22 - storage-provider-webdav: &storage-provider-webdav
23@@ -210,6 +212,7 @@
24 - mcloud: *mcloud
25 - persistent-cache-cpp: *persistent-cache-cpp
26 - storage-framework: *storage-framework
27+ - storage-provider-gdrive: *storage-provider-gdrive
28 - storage-provider-onedrive: *storage-provider-onedrive
29 - storage-provider-webdav: *storage-provider-webdav
30 - thumbnailer: *thumbnailer

Subscribers

People subscribed via source and target branches

to all changes: