Merge lp:~wesmason/conn-check/pin-twisted into lp:conn-check

Proposed by Wes Mason
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 132
Merged at revision: 130
Proposed branch: lp:~wesmason/conn-check/pin-twisted
Merge into: lp:conn-check
Diff against target: 25 lines (+3/-3)
2 files modified
debian/changelog (+2/-2)
requirements.txt (+1/-1)
To merge this branch: bzr merge lp:~wesmason/conn-check/pin-twisted
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Wes Mason (community) Approve
Simon Davy (community) Approve
Review via email: mp+299401@code.launchpad.net

Commit message

Restrict Twisted to <16, as 16+ causes issues with the way we do HTTP checks.

Description of the change

Restrict Twisted to <16, as 16+ causes issues with the way we do HTTP checks.

To post a comment you must log in.
Revision history for this message
Simon Davy (bloodearnest) :
review: Approve
Revision history for this message
Wes Mason (wesmason) :
review: Approve
lp:~wesmason/conn-check/pin-twisted updated
132. By Wes Mason

Fix changelog formatting

Revision history for this message
Vincent Ladeuil (vila) wrote :

Thanks, let's see if that cures jenkins ;-)

review: Approve

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-08-11 17:12:20 +0000
3+++ debian/changelog 2016-07-08 11:37:05 +0000
4@@ -1,7 +1,7 @@
5 conn-check (1.3.1-1) trusty; urgency=low
6
7- * Added guards for port numbers and the HTTP checks expected_code to cast
8- any given value to an int.
9+ * Added guards for port numbers and the HTTP checks expected_code to cast
10+ any given value to an int.
11
12 -- Wes Mason (1stvamp) <wes@1stvamp.org> Tue, 11 Aug 2015 17:10:11 +0000
13
14
15=== modified file 'requirements.txt'
16--- requirements.txt 2015-06-05 16:09:01 +0000
17+++ requirements.txt 2016-07-08 11:37:05 +0000
18@@ -5,6 +5,6 @@
19 pyOpenSSL
20 service-identity
21 requests
22-Twisted
23+Twisted<16
24 txrequests >= 0.9
25 PyYAML

Subscribers

People subscribed via source and target branches

to all changes: