Merge lp:~didrocks/unity-scope-gdrive/add-correct-path into lp:~submarine/unity-scope-gdrive/libunity-7-compatible

Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 42
Merged at revision: 42
Proposed branch: lp:~didrocks/unity-scope-gdrive/add-correct-path
Merge into: lp:~submarine/unity-scope-gdrive/libunity-7-compatible
Diff against target: 12 lines (+1/-1)
1 file modified
gdrive.scope (+1/-1)
To merge this branch: bzr merge lp:~didrocks/unity-scope-gdrive/add-correct-path
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+153850@code.launchpad.net

This proposal supersedes a proposal from 2013-03-18.

Commit message

use correct path

Description of the change

use correct path

To post a comment you must log in.
Revision history for this message
David Callé (davidc3) wrote :

+1

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:42
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~didrocks/unity-scope-gdrive/add-correct-path/+merge/153850/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/submarine-unity-scope-gdrive-libunity-7-compatible-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/submarine-unity-scope-gdrive-libunity-7-compatible-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/submarine-unity-scope-gdrive-libunity-7-compatible-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~didrocks/unity-scope-gdrive/add-correct-path/+merge/153850/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gdrive.scope'
2--- gdrive.scope 2013-03-15 09:26:58 +0000
3+++ gdrive.scope 2013-03-18 15:52:08 +0000
4@@ -3,7 +3,7 @@
5 DBusPath=/com/canonical/unity/scope/file/gdrive
6 Icon=
7 Keywords=gdrive;doc;drive;google;
8-Loader=/usr/share/unity-scopes/gdrive/unity-scope-gdrive.py
9+Loader=/usr/share/unity-scopes/gdrive/unity_gdrive_daemon.py
10 RequiredMetadata=
11 OptionalMetadata=
12 RemoteContent=true

Subscribers

People subscribed via source and target branches