Merge lp:~ahayzen/ubuntu-weather-app/release-3.1 into lp:ubuntu-weather-app

Proposed by Andrew Hayzen on 2015-12-03
Status: Merged
Approved by: Victor Thompson on 2015-12-04
Approved revision: 185
Merged at revision: 185
Proposed branch: lp:~ahayzen/ubuntu-weather-app/release-3.1
Merge into: lp:ubuntu-weather-app
Diff against target: 37 lines (+9/-3)
2 files modified
debian/changelog (+8/-2)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/release-3.1
Reviewer Review Type Date Requested Status
Victor Thompson 2015-12-03 Approve on 2015-12-04
Jenkins Bot continuous-integration Approve on 2015-12-03
Review via email: mp+279459@code.launchpad.net

Commit message

* Release 3.1 and bump version to 3.2

Description of the change

* Release 3.1 and bump version to 3.2

To post a comment you must log in.
review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

lgtm! Thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-11-11 04:02:24 +0000
+++ debian/changelog 2015-12-03 15:33:19 +0000
@@ -1,4 +1,10 @@
1ubuntu-weather-app (3.1ubuntu1) UNRELEASED; urgency=medium1ubuntu-weather-app (3.2) UNRELEASED; urgency=medium
2
3 * Release 3.1 and bump version to 3.2
4
5 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 15:20:49 +0000
6
7ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium
28
3 [ Andrew Hayzen ]9 [ Andrew Hayzen ]
4 * Bump version to 3.110 * Bump version to 3.1
@@ -13,7 +19,7 @@
13 [ Victor Thompson ]19 [ Victor Thompson ]
14 * Create an error state when there are no keys found.20 * Create an error state when there are no keys found.
1521
16 -- Andrew Hayzen <ahayzen@gmail.com> Sat, 24 Oct 2015 20:22:31 +010022 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 15:20:18 +0000
1723
18ubuntu-weather-app (3.0ubuntu1) vivid; urgency=medium24ubuntu-weather-app (3.0ubuntu1) vivid; urgency=medium
1925
2026
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-11-02 21:28:34 +0000
+++ manifest.json.in 2015-12-03 15:33:19 +0000
@@ -12,7 +12,7 @@
12 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",12 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
13 "name": "@PROJECT_NAME@",13 "name": "@PROJECT_NAME@",
14 "title": "Weather",14 "title": "Weather",
15 "version": "3.1.@BZR_REVNO@",15 "version": "3.2.@BZR_REVNO@",
16 "x-source": {16 "x-source": {
17 "vcs-bzr": "@BZR_SOURCE@",17 "vcs-bzr": "@BZR_SOURCE@",
18 "vcs-bzr-revno": "@BZR_REVNO@"18 "vcs-bzr-revno": "@BZR_REVNO@"

Subscribers

People subscribed via source and target branches

to all changes: