Merge lp:~logan/ubuntu/raring/openvswitch/fixes-1094556 into lp:ubuntu/raring/openvswitch

Proposed by Logan Rosen
Status: Merged
Merged at revision: 37
Proposed branch: lp:~logan/ubuntu/raring/openvswitch/fixes-1094556
Merge into: lp:ubuntu/raring/openvswitch
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/openvswitch-controller.default (+1/-1)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/openvswitch/fixes-1094556
Reviewer Review Type Date Requested Status
James Page Approve
Ubuntu branches Pending
Review via email: mp+141477@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Logan

I need todo some fixes for the DKMS package for raring; I'll pull in this change then.

Cheers

James

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 2012-10-23 17:24:17 +0000
3+++ debian/changelog 2012-12-30 06:17:20 +0000
4@@ -1,3 +1,9 @@
5+openvswitch (1.4.3-0ubuntu3) raring; urgency=low
6+
7+ * Fix typo in debian/openvswitch-controller.default (LP: #1094556).
8+
9+ -- Logan Rosen <logatronico@gmail.com> Sat, 29 Dec 2012 23:00:53 -0500
10+
11 openvswitch (1.4.3-0ubuntu2) quantal-proposed; urgency=low
12
13 * Re-enable the openvswitch-datapath-dkms package to enable support
14
15=== modified file 'debian/openvswitch-controller.default'
16--- debian/openvswitch-controller.default 2010-09-23 10:56:18 +0000
17+++ debian/openvswitch-controller.default 2012-12-30 06:17:20 +0000
18@@ -8,7 +8,7 @@
19 # (default: 6633). The private key, certificate, and CA certificate
20 # must be specified below.
21 #
22-# * "pctp:[PORT]": Listen for TCP connections on the specified PORT
23+# * "ptcp:[PORT]": Listen for TCP connections on the specified PORT
24 # (default: 6633). Not recommended for security reasons.
25 #
26 LISTEN="pssl:"

Subscribers

People subscribed via source and target branches

to all changes: