Fix usage of Boron in Carbon GSG

Change-Id: I718a0bfcaf294a722c7fe634d4c50ef868461d71
Signed-off-by: Colin Dixon <colin@colindixon.com>
(cherry picked from commit 8004ac4330f5f253b0d0d2c1113d52ea9dfb39ba)

diff --git a/docs/getting-started-guide/api.rst b/docs/getting-started-guide/api.rst
index 3faff71e4a2bb9f6767b3b31fd01b81f1d62be71..8a3c929046ab0ef2df9f71b0e47a56a9515662bc 100644 (file)
--- a/docs/getting-started-guide/api.rst
+++ b/docs/getting-started-guide/api.rst
@@ -11,6 +11,6 @@ becomes available.
 * odlparent_
 * yangtools_
 
-.. _mdsal: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.mdsal/boron/apidocs/
-.. _odlparent: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.odlparent/boron/apidocs/index.html
-.. _yangtools: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.yangtools/boron/apidocs/index.html
+.. _mdsal: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.mdsal/carbon/apidocs/
+.. _odlparent: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.odlparent/carbon/apidocs/index.html
+.. _yangtools: https://nexus.opendaylight.org/content/sites/site/org.opendaylight.yangtools/carbon/apidocs/index.html

diff --git a/docs/getting-started-guide/common-features/dlux.rst b/docs/getting-started-guide/common-features/dlux.rst
index d08c414dcc6ce4820fa73128bd324d4e0889d4d9..1388ae81f014f3db1545b44c788e2a4e4365d33f 100644 (file)
--- a/docs/getting-started-guide/common-features/dlux.rst
+++ b/docs/getting-started-guide/common-features/dlux.rst
@@ -6,7 +6,7 @@ This section introduces you to the OpenDaylight User Experience (DLUX) applicati
 Getting Started with DLUX
 -------------------------
 
-DLUX provides a number of different Karaf features, which you can enable and disable separately. In Boron they are:
+DLUX provides a number of different Karaf features, which you can enable and disable separately. They are:
 
 #. odl-dlux-core
 #. odl-dlux-node

diff --git a/docs/getting-started-guide/installing_opendaylight.rst b/docs/getting-started-guide/installing_opendaylight.rst
index 816070cbda37def04d41d8454a686259fb7b29dc..ad8372a31cf52dbe4ec92f30612e036a7c760609 100644 (file)
--- a/docs/getting-started-guide/installing_opendaylight.rst
+++ b/docs/getting-started-guide/installing_opendaylight.rst
@@ -40,22 +40,22 @@ To run the Karaf distribution:
 
 For Example::
 
-   $ ls distribution-karaf-0.5.x-Boron.zip
-   distribution-karaf-0.5.x-Boron.zip
-   $ unzip distribution-karaf-0.5.x-Boron.zip
-   Archive:  distribution-karaf-0.5.x-Boron.zip
-      creating: distribution-karaf-0.5.x-Boron/
-      creating: distribution-karaf-0.5.x-Boron/configuration/
-      creating: distribution-karaf-0.5.x-Boron/data/
-      creating: distribution-karaf-0.5.x-Boron/data/tmp/
-      creating: distribution-karaf-0.5.x-Boron/deploy/
-      creating: distribution-karaf-0.5.x-Boron/etc/
-      creating: distribution-karaf-0.5.x-Boron/externalapps/
+   $ ls distribution-karaf-0.6.x-Carbon.zip
+   distribution-karaf-0.6.x-Carbon.zip
+   $ unzip distribution-karaf-0.6.x-Carbon.zip
+   Archive:  distribution-karaf-0.6.x-Carbon.zip
+      creating: distribution-karaf-0.6.x-Carbon/
+      creating: distribution-karaf-0.6.x-Carbon/configuration/
+      creating: distribution-karaf-0.6.x-Carbon/data/
+      creating: distribution-karaf-0.6.x-Carbon/data/tmp/
+      creating: distribution-karaf-0.6.x-Carbon/deploy/
+      creating: distribution-karaf-0.6.x-Carbon/etc/
+      creating: distribution-karaf-0.6.x-Carbon/externalapps/
       ...
-      inflating: distribution-karaf-0.5.x-Boron/bin/start.bat
-      inflating: distribution-karaf-0.5.x-Boron/bin/status.bat
-      inflating: distribution-karaf-0.5.x-Boron/bin/stop.bat
-   $ cd distribution-karaf-0.5.x-Boron
+      inflating: distribution-karaf-0.6.x-Carbon/bin/start.bat
+      inflating: distribution-karaf-0.6.x-Carbon/bin/status.bat
+      inflating: distribution-karaf-0.6.x-Carbon/bin/stop.bat
+   $ cd distribution-karaf-0.6.x-Carbon
    $ ./bin/karaf
 
        ________                       ________                .__  .__       .__     __

diff --git a/docs/getting-started-guide/project-release-notes/gbp-release-notes.rst b/docs/getting-started-guide/project-release-notes/gbp-release-notes.rst
index 4847209189ce6f41fa7bebc53ee4beeca796b065..3c1dfe8bdda8642fbd79b0b87356f0ca97079afa 100644 (file)
--- a/docs/getting-started-guide/project-release-notes/gbp-release-notes.rst
+++ b/docs/getting-started-guide/project-release-notes/gbp-release-notes.rst
@@ -18,29 +18,29 @@ Major Features
 odl-groupbasedpolicy-ofoverlay
 ------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:** Feature can be added to the base to enable a Network Virtualization behavior using OpenFlow
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-boron/
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-carbon/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-carbon/
 
 odl-groupbasedpolicy-ovssfc
 ---------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:** Feature can be added to the base to enable a Network Virtualization behavior using OpenFlow that integrates with the SFC project
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-boron/
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-carbon/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-carbon/
 
 odl-groupbasedpolicy-faas
 -------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps GBP service model to the common abstraction logical network models of the Fabric As A Service (FAAS). In turns, FAAS maps those abstraction models to the physical networks.
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -50,7 +50,7 @@ odl-groupbasedpolicy-faas
 odl-groupbasedpolicy-iovisor
 ----------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps GBP service model to agents of the IOVisor Linux Foundation project
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -60,7 +60,7 @@ odl-groupbasedpolicy-iovisor
 odl-groupbasedpolicy-netconf
 ----------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps GBP service model to NETCONF based network elements
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -70,29 +70,29 @@ odl-groupbasedpolicy-netconf
 odl-groupbasedpolicy-neutronmapper
 ----------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps Neutron northbound configuration to GBP service model
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon/
 
 odl-groupbasedpolicy-neutron-and-ofoverlay
 ------------------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Neutron and OpenFlow Overlay
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-boron/
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-boron/
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-only-carbon/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-only-carbon/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon/
 
 odl-groupbasedpolicy-vpp
 ------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps GBP service model to VPP devices
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -102,17 +102,17 @@ odl-groupbasedpolicy-vpp
 odl-groupbasedpolicy-neutron-vpp-mapper
 ---------------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Neutron Northbound services for VPP renderer
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon/
 
 odl-groupbasedpolicy-ui
 -----------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Groupbasedpolicy User Interface
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -122,7 +122,7 @@ odl-groupbasedpolicy-ui
 odl-groupbasedpolicy-ip-sgt-distribution-service
 ------------------------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  SXP Distribution Service
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -132,7 +132,7 @@ odl-groupbasedpolicy-ip-sgt-distribution-service
 odl-groupbasedpolicy-ios-xe
 ---------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  This renderer maps GBP service model to IOS-XE devices
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -142,7 +142,7 @@ odl-groupbasedpolicy-ios-xe
 odl-groupbasedpolicy-sxp-ep-provider
 ------------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  SXP integration: Endpoint provider
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -152,7 +152,7 @@ odl-groupbasedpolicy-sxp-ep-provider
 odl-groupbasedpolicy-sxp-ise-adapter
 ------------------------------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;h=df5008a589f69302250b0a2450a2d262f239477f;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=blob;f=features/features-groupedpolicy/src/main/features/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  SXP integration: ISE adapter
 * **Top Level:** Yes
 * **User Facing:** Yes
@@ -183,10 +183,10 @@ Quality Assurance
 
 Groupbasedpolicy CSIT:
 
-* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-all-boron/
-* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-all-boron/
-* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron/
-* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-3node-clustering-all-boron/
+* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-3-node-all-carbon/
+* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-6node-all-carbon/
+* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon/
+* https://jenkins.opendaylight.org/releng/view/groupbasedpolicy/job/groupbasedpolicy-csit-3node-clustering-all-carbon/
 
 Other manual testing and QA information
 

diff --git a/docs/getting-started-guide/project-release-notes/sample-release-notes.rst b/docs/getting-started-guide/project-release-notes/sample-release-notes.rst
index 3b80bf0cda3905fc3ba44f294bfa577224c6efae..815fa7a78b40399e6f84e1cc4fc1b30d48e4ce2a 100644 (file)
--- a/docs/getting-started-guide/project-release-notes/sample-release-notes.rst
+++ b/docs/getting-started-guide/project-release-notes/sample-release-notes.rst
@@ -47,7 +47,7 @@ Feature Name
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sample/job/sample-csit-1node-feature-all-boron/
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sample/job/sample-csit-1node-feature-all-carbon/
 
 Documentation
 =============

diff --git a/docs/getting-started-guide/project-release-notes/sfc.rst b/docs/getting-started-guide/project-release-notes/sfc.rst
index a84879d5052112004134d437b5b82ccdf9b5302e..7ba7ddcdb7349c932bd628c5355267aeeaab0b51 100644 (file)
--- a/docs/getting-started-guide/project-release-notes/sfc.rst
+++ b/docs/getting-started-guide/project-release-notes/sfc.rst
@@ -13,7 +13,7 @@ odl-sfc-netconf
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-scf-openflow
@@ -24,7 +24,7 @@ odl-sfc-scf-openflow
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-scf-vpp
@@ -35,7 +35,7 @@ odl-sfc-scf-vpp
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-openflow-renderer
@@ -46,7 +46,7 @@ odl-sfc-openflow-renderer
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfclisp
@@ -57,7 +57,7 @@ odl-sfclisp
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-sb-rest
@@ -68,7 +68,7 @@ odl-sfc-sb-rest
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-ui
@@ -79,7 +79,7 @@ odl-sfc-ui
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-vnfm-tacker
@@ -90,7 +90,7 @@ odl-sfc-vnfm-tacker
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-ios-xe-renderer
@@ -101,7 +101,7 @@ odl-sfc-ios-xe-renderer
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-vpp-renderer
@@ -112,7 +112,7 @@ odl-sfc-vpp-renderer
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-pot
@@ -123,7 +123,7 @@ odl-sfc-pot
 * **Top Level:** Yes
 * **User Facing:** Yes
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 These features are consumed by the User facing features above
@@ -138,7 +138,7 @@ odl-sfc-genius
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-model
@@ -149,7 +149,7 @@ odl-sfc-model
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-pot-netconf-renderer
@@ -160,7 +160,7 @@ odl-sfc-pot-netconf-renderer
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-provider
@@ -171,7 +171,7 @@ odl-sfc-provider
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-provider-rest
@@ -182,7 +182,7 @@ odl-sfc-provider-rest
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-ovs
@@ -193,7 +193,7 @@ odl-sfc-ovs
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** No
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 odl-sfc-test-consumer
@@ -204,7 +204,7 @@ odl-sfc-test-consumer
 * **Top Level:** Yes
 * **User Facing:** No
 * **Experimental:** Yes
-* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-boron
+* **CSIT Test:** https://jenkins.opendaylight.org/releng/view/sfc/job/sfc-csit-3node-clustering-all-carbon
 
 
 Features removed in this release

diff --git a/docs/getting-started-guide/project-release-notes/topology-processing-framework.rst b/docs/getting-started-guide/project-release-notes/topology-processing-framework.rst
index 7b9a48ac53f68b73f0964cc2dcea17d206481312..06eaa95bbcfd6b7f90d11adc7cc559b03ca24bb9 100644 (file)
--- a/docs/getting-started-guide/project-release-notes/topology-processing-framework.rst
+++ b/docs/getting-started-guide/project-release-notes/topology-processing-framework.rst
@@ -8,7 +8,7 @@ Major Features
 odl-topoprocessing-framewrok
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Topology processing core
 * **Top Level:** No
 * **User Facing:** No
@@ -18,7 +18,7 @@ odl-topoprocessing-framewrok
 odl-topoprocessing-mlmt
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Multi-Layer and Multi-Technology (MLMT) module
 * **Top Level:** Yes
 * **User Facing:** No
@@ -28,7 +28,7 @@ odl-topoprocessing-mlmt
 odl-topoprocessing-network-topology
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Support for network-topology model
 * **Top Level:** Yes
 * **User Facing:** No
@@ -38,7 +38,7 @@ odl-topoprocessing-network-topology
 odl-topoprocessing-inventory
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Support for inventory model
 * **Top Level:** Yes
 * **User Facing:** No
@@ -48,7 +48,7 @@ odl-topoprocessing-inventory
 odl-topoprocessing-I2rs
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Support for i2rs model
 * **Top Level:** Yes
 * **User Facing:** No
@@ -58,7 +58,7 @@ odl-topoprocessing-I2rs
 odl-topoprocessing-inventory-rendering
 ------------
 
-* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;h=0f4b0c438e19f57682ae5586696c36f238bb6255;hb=refs/heads/stable/carbon
+* **Feature URL:** https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml;hb=refs/heads/stable/carbon
 * **Feature Description:**  Rendering demo
 * **Top Level:** Yes
 * **User Facing:** No
@@ -71,7 +71,7 @@ Documentation
 * **Developer Guide(s):**
 
   * `Docs on docs.opendaylight.org <http://docs.opendaylight.org/en/latest/developer-guide/topology-processing-framework-developer-guide.html>`_
-  * `Rst documentation <https://git.opendaylight.org/gerrit/gitweb?p=docs.git;a=blob;f=docs/developer-guide/topology-processing-framework-developer-guide.rst;h=9ee838bc79b80bb1b6a8230f8d5402495348e8e0;hb=refs/heads/stable/boron>`_
+  * `Rst documentation <https://git.opendaylight.org/gerrit/gitweb?p=docs.git;a=blob;f=docs/developer-guide/topology-processing-framework-developer-guide.rst;hb=refs/heads/stable/carbon>`_
   * `Wiki <https://wiki.opendaylight.org/view/Topology_Processing_Framework:Developer_Guide>`_
 
 Security Considerations

diff --git a/docs/getting-started-guide/project-specific-guides/vtn.rst b/docs/getting-started-guide/project-specific-guides/vtn.rst
index 918fcaf30dc70f1401431f3676583dabc10ecb84..1a51016cf6521944e72e544faaa3e8e738238530 100644 (file)
--- a/docs/getting-started-guide/project-specific-guides/vtn.rst
+++ b/docs/getting-started-guide/project-specific-guides/vtn.rst
@@ -72,13 +72,13 @@ Install Feature::
 VTN Coordinator
 ^^^^^^^^^^^^^^^
 
-* To get the Boron distribution for VTN coordinator download the latest "tar.bz2" file from the below link::
+* To get the Carbon distribution for VTN coordinator download the latest "tar.bz2" file from the below link::
 
-     https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/vtn/distribution.vtn-coordinator/6.3.0-Boron/
+     https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/vtn/distribution.vtn-coordinator/6.4.0-Carbon/
 
 * Run the below command to extract VTN Coordinator from the tar.bz2 file::
 
-     tar –C/ -jxvf distribution.vtn-coordinator-6.3.0-Boron-bin.tar.bz2
+     tar –C/ -jxvf distribution.vtn-coordinator-6.4.0-Carbon-bin.tar.bz2
 
 This will install VTN Coordinator to /usr/local/vtn directory.
 The name of the tar.bz2 file name varies depending on the version. Please give the same tar.bz2 file name which is there in your directory.

diff --git a/docs/getting-started-guide/release_notes.rst b/docs/getting-started-guide/release_notes.rst
index 0e10a8658a95f6a6a8fcaf2d24bddf7abe1a8fa2..982768761a8be76436d510b755aa3ae9a578b0d8 100644 (file)
--- a/docs/getting-started-guide/release_notes.rst
+++ b/docs/getting-started-guide/release_notes.rst
@@ -55,7 +55,7 @@ Known Issues and Limitations
 Other than as noted in project-specific release notes, we know of the
 following limitations:
 
-* Migration from Helium, Lithium and Beryllium to Boron has not been
+* Migration from prior OpenDaylight releases to Carbon has not been
   extensively tested. The per-project release notes include migration and
   compatibility information when it is known.
 * There are scales beyond which the controller has been unreliable when