diff mbox series

[ovs-dev] Fix references to integration.rst document in ovn-architecture.7

Message ID 20200213173011.1361583-1-ihrachys@redhat.com
State Superseded, archived
Headers show
Series [ovs-dev] Fix references to integration.rst document in ovn-architecture.7 | expand

Commit Message

Ihar Hrachyshka Feb. 13, 2020, 5:30 p.m. UTC 
The name is changed, and also the document is hosted in OVN tree that is
separate from OVS tree.

Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>
---
 ovn-architecture.7.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Comments

0-day Robot Feb. 13, 2020, 6:09 p.m. UTC | #1 
Bleep bloop.  Greetings Ihar Hrachyshka, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


git-am:
fatal: sha1 information is lacking or useless (ovn-architecture.7.xml).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Fix references to integration.rst document in ovn-architecture.7
The copy of the patch that failed is found in:
   /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
Ben Pfaff Feb. 13, 2020, 7:05 p.m. UTC | #2 
On Thu, Feb 13, 2020 at 12:30:11PM -0500, Ihar Hrachyshka wrote:
> The name is changed, and also the document is hosted in OVN tree that is
> separate from OVS tree.
> 
> Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>

Thanks, applied to master.
diff mbox series

Patch

diff --git a/ovn-architecture.7.xml b/ovn-architecture.7.xml
index 71efa41db..6fd23dc1c 100644
--- a/ovn-architecture.7.xml
+++ b/ovn-architecture.7.xml
@@ -42,8 +42,8 @@ 
     <li>
       One or more (usually many) <dfn>hypervisors</dfn>.  Hypervisors must run
       Open vSwitch and implement the interface described in
-      <code>IntegrationGuide.rst</code> in the OVS source tree.  Any hypervisor
-      platform supported by Open vSwitch is acceptable.
+      <code>Documentation/topics/integration.rst</code> in the OVN source tree.
+      Any hypervisor platform supported by Open vSwitch is acceptable.
     </li>
 
     <li>
@@ -294,10 +294,10 @@ 
     <li>
       On a hypervisor, any VIFs that are to be attached to logical networks.
       The hypervisor itself, or the integration between Open vSwitch and the
-      hypervisor (described in <code>IntegrationGuide.rst</code>) takes care of
-      this.  (This is not part of OVN or new to OVN; this is pre-existing
-      integration work that has already been done on hypervisors that support
-      OVS.)
+      hypervisor (described in
+      <code>Documentation/topics/integration.rst</code>) takes care of this.
+      (This is not part of OVN or new to OVN; this is pre-existing integration
+      work that has already been done on hypervisors that support OVS.)
     </li>
 
     <li>
@@ -489,8 +489,9 @@ 
     <li>
       Eventually, a user powers on the VM that owns the VIF.  On the hypervisor
       where the VM is powered on, the integration between the hypervisor and
-      Open vSwitch (described in <code>IntegrationGuide.rst</code>) adds the VIF
-      to the OVN integration bridge and stores <var>vif-id</var> in
+      Open vSwitch (described in
+      <code>Documentation/topics/integration.rst</code>) adds the VIF to the OVN
+      integration bridge and stores <var>vif-id</var> in
       <code>external_ids</code>:<code>iface-id</code> to indicate that the
       interface is an instantiation of the new VIF.  (None of this code is new
       in OVN; this is pre-existing integration work that has already been done