Ubuntu Push Notifications

Merge lp:~chipaca/ubuntu-push/promises-schmromises into lp:ubuntu-push

  1. promises-schmromises
  2. Merge into trunk
Proposed by John Lenton
Status: Rejected
Rejected by: Samuele Pedroni
Proposed branch: lp:~chipaca/ubuntu-push/promises-schmromises
Merge into: lp:ubuntu-push
Diff against target: 61 lines (+13/-5)
3 files modified
debian/changelog (+8/-0)
launch_helper/kindpool_test.go (+3/-3)
signing-helper/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~chipaca/ubuntu-push/promises-schmromises
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+266549@code.launchpad.net

Commit message

Tests pass with go 1.4 again.

Description of the change

Oooh, look. A fix because of a change to go that breaks the compatibility promise!

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-04-30 15:08:57 +0000
3+++ debian/changelog 2015-07-31 14:51:33 +0000
4@@ -1,3 +1,11 @@
5+ubuntu-push (0.69-0ubuntu1) wily; urgency=medium
6+
7+ [ John R. Lenton ]
8+ * go's compatibility promise fails us again; fixes for 1.4.
9+ * fix gcc5-related linking issues.
10+
11+ -- John R. Lenton <john.lenton@canonical.com> Fri, 31 Jul 2015 13:52:04 +0100
12+
13 ubuntu-push (0.68+15.04.20150430.1-0ubuntu1) vivid; urgency=medium
14
15 [ Samuele Pedroni ]
16
17=== modified file 'launch_helper/kindpool_test.go'
18--- launch_helper/kindpool_test.go 2015-03-18 16:34:11 +0000
19+++ launch_helper/kindpool_test.go 2015-07-31 14:51:33 +0000
20@@ -278,7 +278,7 @@
21 args := HelperArgs{
22 Input: input,
23 FileOut: filepath.Join(d, "file_out.json"),
24- Timer: &time.Timer{},
25+ Timer: time.NewTimer(0),
26 }
27 pool.hmap["l:1"] = &args
28
29@@ -310,7 +310,7 @@
30 Payload: []byte(`"hello"`),
31 },
32 FileOut: "/does-not-exist",
33- Timer: &time.Timer{},
34+ Timer: time.NewTimer(0),
35 }
36 pool.hmap["l:1"] = &args
37
38@@ -337,7 +337,7 @@
39 NotificationId: "foo",
40 Payload: []byte(`"hello"`),
41 },
42- Timer: &time.Timer{},
43+ Timer: time.NewTimer(0),
44 }
45 pool.hmap["l:1"] = &args
46
47
48=== modified file 'signing-helper/CMakeLists.txt'
49--- signing-helper/CMakeLists.txt 2014-04-30 17:34:57 +0000
50+++ signing-helper/CMakeLists.txt 2015-07-31 14:51:33 +0000
51@@ -13,8 +13,8 @@
52 SET (CMAKE_AUTOMOC ON)
53 find_package(Qt5Core REQUIRED)
54
55-FILE (GLOB SIGNING_SOURCES signing*.cpp)
56-FILE (GLOB SIGNING_HEADERS signing*.h)
57+SET (SIGNING_SOURCES signing-helper.cpp)
58+SET (SIGNING_HEADERS signing.h)
59
60 add_executable (${SIGNING_EXE}
61 ${SIGNING_SOURCES}

Subscribers

People subscribed via source and target branches