| commit | 30444e981ba28e892c439017fbc011d867f02a7d | [log] [tgz] |
|---|---|---|
| author | Jesse Gross <jesse@nicira.com> | Mon May 13 08:41:06 2013 -0700 |
| committer | Jesse Gross <jesse@nicira.com> | Wed Aug 14 15:48:02 2013 -0700 |
| tree | 3f26f5da57a38f9365b03696c7cb733f86b67554 | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 [diff] |
openvswitch: Fix bad merge resolution. git silently included an extra hunk in vport_cmd_set() during automatic merging. This code is unreachable so it does not actually introduce a problem but it is clearly incorrect. Signed-off-by: Jesse Gross <jesse@nicira.com>