From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 5 Mar 2015 04:49:15 +0000 (+0000)
Subject: Merge "Metaplugin decomposition"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7cd356964cb45509994c98c9933452786a485aae;p=openstack-build%2Fneutron-build.git

Merge "Metaplugin decomposition"
---

7cd356964cb45509994c98c9933452786a485aae
diff --cc doc/source/devref/contribute.rst
index 38d237dd1,726da0fe5..90314a096
--- a/doc/source/devref/contribute.rst
+++ b/doc/source/devref/contribute.rst
@@@ -401,9 -401,9 +401,9 @@@ The following chart captures the follow
  +-------------------------------+-----------------------+-----------+------------------+---------+--------------+
  | networking-hyperv_            |                       |           |                  |         |              |
  +-------------------------------+-----------------------+-----------+------------------+---------+--------------+
- | networking-metaplugin_        |                       |           |                  |         |              |
+ | networking-metaplugin_        |         core          |    no     |       no         |   [C]   |     Kilo     |
  +-------------------------------+-----------------------+-----------+------------------+---------+--------------+
 -| networking-midonet_           |                       |           |                  |         |              |
 +| networking-midonet_           |        core,lb        |    yes    |       yes        |   [C]   |     Kilo     |
  +-------------------------------+-----------------------+-----------+------------------+---------+--------------+
  | networking-mlnx_              |                       |           |                  |         |              |
  +-------------------------------+-----------------------+-----------+------------------+---------+--------------+
@@@ -440,15 -440,13 +440,20 @@@ Arist
  
  .. _networking-metaplugin:
  
+ Metaplugin
+ ----------
+ 
+ * Git: https://github.com/ntt-sic/networking-metaplugin
+ 
  .. _networking-midonet:
  
 +MidoNet
 +-------
 +
 +*  Git: https://github.com/stackforge/networking-midonet
 +*  Launchpad: https://launchpad.net/networking-midonet
 +*  Pypi: https://pypi.python.org/pypi/networking-midonet
 +
  .. _networking-mlnx:
  
  .. _nuage-openstack-neutron: