cupstream2distro Configuration

Merge lp:~fginther/cupstream2distro-config/vivid-branch-fixes into lp:cupstream2distro-config

  1. vivid-branch-fixes
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 1263
Merged at revision: 1262
Proposed branch: lp:~fginther/cupstream2distro-config/vivid-branch-fixes
Merge into: lp:cupstream2distro-config
Diff against target: 25 lines (+2/-2)
2 files modified
stacks/vivid/click-package.cfg (+1/-1)
stacks/vivid/webcred.cfg (+1/-1)
To merge this branch: bzr merge lp:~fginther/cupstream2distro-config/vivid-branch-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Paul Larson Approve
Review via email: mp+259275@code.launchpad.net

Commit message

Fix typos in branch names for lp:ubuntuone-credentials/touch-15-04 and lp:unity-scope-click/touch-15-04.

Description of the change

Fix typos in branch names for lp:ubuntuone-credentials/touch-15-04 and lp:unity-scope-click/touch-15-04.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Checked launchpad, confirmed the new names are correct. +1

review: Approve
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 'stacks/vivid/click-package.cfg'
2--- stacks/vivid/click-package.cfg 2015-05-15 02:25:57 +0000
3+++ stacks/vivid/click-package.cfg 2015-05-15 18:26:27 +0000
4@@ -19,7 +19,7 @@
5 hooks: H05set_package_version H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
6 hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook
7 test_suite: unityclickscope
8- target_branch: unity-scope-click/touch-15.04
9+ target_branch: lp:unity-scope-click/touch-15-04
10 to_transition:
11 click:
12 autolanding_template: False
13
14=== modified file 'stacks/vivid/webcred.cfg'
15--- stacks/vivid/webcred.cfg 2015-05-14 22:16:59 +0000
16+++ stacks/vivid/webcred.cfg 2015-05-15 18:26:27 +0000
17@@ -21,7 +21,7 @@
18 account-polld:
19 autolanding_template: False
20 ubuntuone-credentials:
21- target_branch: lp:ubuntuone-credentials/touch-15.04
22+ target_branch: lp:ubuntuone-credentials/touch-15-04
23 autolanding_template: False
24 hooks: H05set_package_version H10strip_native_depends D09add_ppa~ci-train-ppa-service~stable-phone-overlay
25 hook_source: lp:~canonical-ci-engineering/+junk/native-strip-hook

Subscribers

People subscribed via source and target branches

to all changes: