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

[Logan Rosen]

[James Page (james-page)]

Logan

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

Cheers

James

review: Approve

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