Storage Framework

Merge lp:~michihenning/storage-framework/add-nextcloud-provider into lp:storage-framework/devel

  1. add-nextcloud-provider
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 124
Merged at revision: 124
Proposed branch: lp:~michihenning/storage-framework/add-nextcloud-provider
Merge into: lp:storage-framework/devel
Diff against target: 27 lines (+3/-1)
2 files modified
src/qt/client/internal/remote_client/RuntimeImpl.cpp (+1/-0)
src/registry/internal/ListAccountsHandler.cpp (+2/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/add-nextcloud-provider
Reviewer Review Type Date Requested Status
James Henstridge Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+322079@code.launchpad.net

Commit message

Added changes needed by
https://code.launchpad.net/~jamesh/storage-provider-webdav/nextcloud-provider/+merge/321948
for Nextcloud provider.

Description of the change

Added changes needed by
https://code.launchpad.net/~jamesh/storage-provider-webdav/nextcloud-provider/+merge/321948
for Nextcloud provider.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:124
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/280/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1920
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1927
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1709/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/280/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
2--- src/qt/client/internal/remote_client/RuntimeImpl.cpp 2017-01-13 04:03:12 +0000
3+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp 2017-04-06 02:24:50 +0000
4@@ -52,6 +52,7 @@
5 { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
6 { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
7 { "storage-provider-gdrive", "com.canonical.StorageFramework.Provider.GdriveProvider" },
8+ { "storage-provider-nextloud", "com.canonical.StorageFramework.Provider.Nextcloud" },
9 };
10
11 } // namespace
12
13=== modified file 'src/registry/internal/ListAccountsHandler.cpp'
14--- src/registry/internal/ListAccountsHandler.cpp 2017-03-17 09:43:46 +0000
15+++ src/registry/internal/ListAccountsHandler.cpp 2017-04-06 02:24:50 +0000
16@@ -71,9 +71,10 @@
17 {
18 { "storage-provider-test", { "com.canonical.StorageFramework.Provider.ProviderTest", "Test Provider" } },
19 { "storage-provider-mcloud", { "com.canonical.StorageFramework.Provider.McloudProvider", "mcloud" } },
20- { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "ownCloud" } },
21+ { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "OwnCloud" } },
22 { "storage-provider-onedrive", { "com.canonical.StorageFramework.Provider.OnedriveProvider", "OneDrive" } },
23 { "storage-provider-gdrive", { "com.canonical.StorageFramework.Provider.GdriveProvider", "GDrive" } },
24+ { "storage-provider-nextcloud", { "com.canonical.StorageFramework.Provider.Nextcloud", "Nextcloud" } },
25 };
26
27 } // namespace

Subscribers

People subscribed via source and target branches

to all changes: