brcompat: Mark ovs-brcompat as deprecated.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
bug #14341

diff --git a/NEWS b/NEWS
index 3cda201..0b90042 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ v1.9.0 - xx xxx xxxx
     - The following features are now deprecated.  They will be removed no
       earlier than February 2013.  Please email dev@openvswitch.org with
       concerns.
     - The following features are now deprecated.  They will be removed no
       earlier than February 2013.  Please email dev@openvswitch.org with
       concerns.

+        - Bridge compatibility.

         - Stable bond mode.
         - The autopath action.
         - Interface type "null".
         - Stable bond mode.
         - The autopath action.
         - Interface type "null".

diff --git a/debian/changelog b/debian/changelog
index 5d3dd35..d69867f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ openvswitch (1.9.0-1) unstable; urgency=low
     - The following features are now deprecated.  They will be removed no
       earlier than February 2013.  Please email dev@openvswitch.org with
       concerns.
     - The following features are now deprecated.  They will be removed no
       earlier than February 2013.  Please email dev@openvswitch.org with
       concerns.

+        - Bridge compatibility.

         - Stable bond mode.
         - The autopath action.
         - Interface type "null".
         - Stable bond mode.
         - The autopath action.
         - Interface type "null".

diff --git a/vswitchd/ovs-brcompatd.8.in b/vswitchd/ovs-brcompatd.8.in
index fdce042..1ba4a21 100644 (file)
--- a/vswitchd/ovs-brcompatd.8.in
+++ b/vswitchd/ovs-brcompatd.8.in
@@ -13,6 +13,7 @@ A daemon that provides a legacy bridge front-end for \fBovs\-vswitchd\fR.  It
 does this by listening for bridge ioctl commands (e.g., those generated by
 the \fBbrctl\fR program) to add or remove datapaths and the interfaces
 that attach to them.
 does this by listening for bridge ioctl commands (e.g., those generated by
 the \fBbrctl\fR program) to add or remove datapaths and the interfaces
 that attach to them.

+This feature is deprecated and will be removed no earlier than February 2013.

 .PP
 .SH OPTIONS
 .IP "\fB\-\-appctl=\fIprogram\fR"
 .PP
 .SH OPTIONS
 .IP "\fB\-\-appctl=\fIprogram\fR"

diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index df9332f..f98d3f5 100644 (file)
--- a/vswitchd/ovs-brcompatd.c
+++ b/vswitchd/ovs-brcompatd.c
@@ -805,6 +805,8 @@ main(int argc, char *argv[])
     set_program_name(argv[0]);
     vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
 
     set_program_name(argv[0]);
     vlog_set_levels(&VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
 

+    VLOG_WARN("Bridge compatibility is deprecated and may be removed "
+              "no earlier than February 2013");

     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
     process_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
     process_init();