Merge lp:~nskaggs/phablet-tools/default-to-1404-fixed into lp:phablet-tools

Proposed by Nicholas Skaggs on 2014-05-03
Status: Needs review
Proposed branch: lp:~nskaggs/phablet-tools/default-to-1404-fixed
Merge into: lp:phablet-tools
Diff against target: 21 lines (+2/-2)
1 file modified
click-buddy (+2/-2)
To merge this branch: bzr merge lp:~nskaggs/phablet-tools/default-to-1404-fixed
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2014-05-03 Approve on 2014-05-06
Ubuntu Phablet Team 2014-05-03 Pending
Review via email: mp+218191@code.launchpad.net

This proposal supersedes a proposal from 2014-05-02.

Commit message

Change default framework to 14.04, which is latest stable

Description of the change

Change default framework to 14.04, which is latest stable

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote : Posted in a previous version of this proposal

Wow, that's a lot of whitespace changes. Even using vi, I get this, not sure what the deal is :-)

PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal

On Fri, May 2, 2014 at 5:41 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Wow, that's a lot of whitespace changes. Even using vi, I get this, not
> sure what the deal is :-)
>

You might have an autosave hook that does s/<tab>/<spaces>/ ;-)

Nicholas Skaggs (nskaggs) wrote :

Right you are sergio ;-) But why tabs in the file anyway.. diff is fixed.

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:269
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/~nskaggs/phablet-tools/default-to-1404-fixed/+merge/218191/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/319/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/319/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

269. By Nicholas Skaggs on 2014-05-03

change default sdk framework to 14.04

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'click-buddy'
2--- click-buddy 2014-04-14 18:45:09 +0000
3+++ click-buddy 2014-05-03 17:23:24 +0000
4@@ -36,7 +36,7 @@
5 --arch Target architecture, requires a created click chroot
6 (defaults to arch all)
7 --framework Target click framework, requires a created click chroot
8- (defaults to ubuntu-sdk-13.10)
9+ (defaults to ubuntu-sdk-14.04)
10 EOF
11 }
12
13@@ -47,7 +47,7 @@
14 NO_CLEAN=""
15 EXTRA_DEPS=""
16 ARCH="all"
17-FRAMEWORK="ubuntu-sdk-13.10"
18+FRAMEWORK="ubuntu-sdk-14.04"
19 MAINTMODE=""
20
21 TEST_DIR='tests/autopilot'

Subscribers

People subscribed via source and target branches