persistent-cache-cpp

Merge lp:~michihenning/persistent-cache-cpp/merge-trunk into lp:persistent-cache-cpp/devel

  1. merge-trunk
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 40
Merged at revision: 40
Proposed branch: lp:~michihenning/persistent-cache-cpp/merge-trunk
Merge into: lp:persistent-cache-cpp/devel
Diff against target: 18 lines (+6/-2)
1 file modified
debian/changelog (+6/-2)
To merge this branch: bzr merge lp:~michihenning/persistent-cache-cpp/merge-trunk
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michi Henning (community) Approve
Review via email: mp+283234@code.launchpad.net

Commit message

Merge 1.0.4+16.04.20160117-0ubuntu1 from trunk after release.

Description of the change

Merge 1.0.4+16.04.20160117-0ubuntu1 from trunk after release.

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

Top-approving trunk merge.

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
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-09 06:17:05 +0000
+++ debian/changelog 2016-01-19 23:12:30 +0000
@@ -1,9 +1,13 @@
1persistent-cache-cpp (1.0.4+15.10.20150819.2-0ubuntu2) UNRELEASED; urgency=medium1persistent-cache-cpp (1.0.4+16.04.20160117-0ubuntu1) xenial; urgency=medium
22
3 [ Michi Henning ]
3 * Fixed assertion failure when move-constructing a stats instance from4 * Fixed assertion failure when move-constructing a stats instance from
4 the internal instance.5 the internal instance.
56
6 -- Michi Henning <michi.henning@canonical.com> Wed, 09 Dec 2015 16:16:41 +10007 [ CI Train Bot ]
8 * No-change rebuild.
9
10 -- Michi Henning <michi.henning@canonical.com> Sun, 17 Jan 2016 22:35:54 +0000
711
8persistent-cache-cpp (1.0.4+15.10.20150819.2-0ubuntu1) wily; urgency=medium12persistent-cache-cpp (1.0.4+15.10.20150819.2-0ubuntu1) wily; urgency=medium
913

Subscribers

People subscribed via source and target branches