Ubuntu Calendar App

Merge lp:~popey/ubuntu-calendar-app/fix-1336764 into lp:ubuntu-calendar-app

  1. fix-1336764
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 341
Merged at revision: 341
Proposed branch: lp:~popey/ubuntu-calendar-app/fix-1336764
Merge into: lp:ubuntu-calendar-app
Diff against target: 21 lines (+2/-2)
2 files modified
click/apparmor.json (+1/-1)
click/manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-calendar-app/fix-1336764
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+225306@code.launchpad.net

Commit message

bump framework

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/598/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/751
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/751/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/156

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/598/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Ohh.. jenkins says, IOError: [Errno 28] No space left on device

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Resubmitting..

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/599/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/764
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/157

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/599/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/600/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/766
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/158

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/600/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click/apparmor.json'
2--- click/apparmor.json 2014-05-02 10:12:34 +0000
3+++ click/apparmor.json 2014-07-02 12:36:26 +0000
4@@ -1,4 +1,4 @@
5 {
6 "policy_groups": ["calendar", "networking"],
7- "policy_version": 1.1
8+ "policy_version": 1.2
9 }
10
11=== modified file 'click/manifest.json.in'
12--- click/manifest.json.in 2014-06-06 22:00:13 +0000
13+++ click/manifest.json.in 2014-07-02 12:36:26 +0000
14@@ -1,6 +1,6 @@
15 {
16 "description": "A calendar for Ubuntu which syncs with online accounts",
17- "framework": "ubuntu-sdk-14.04-qml-dev1",
18+ "framework": "ubuntu-sdk-14.04-qml-dev2",
19 "hooks": {
20 "@APP_NAME@": {
21 "apparmor": "apparmor.json",

Subscribers

People subscribed via source and target branches

to status/vote changes: