From 3462f952936b518bbf5d1295c99d188a12ade674 Mon Sep 17 00:00:00 2001 From: Olivier Bourdon Date: Fri, 13 May 2016 09:32:30 +0200 Subject: [PATCH] Update version for the next delivery Change-Id: Ic48d9c5bf43651828b3ccedff6644b99b99efaed --- README.md | 4 ++-- doc/plugin-guide/source/conf.py | 4 ++-- doc/plugin-guide/source/description.rst | 12 ++++++++---- doc/plugin-guide/source/installation.rst | 6 +++--- doc/plugin-guide/source/removal.rst | 2 +- doc/qa/source/conf.py | 4 ++-- doc/qa/source/test-strategy.rst | 4 ++-- specs/zabbix-plugin-spec.rst | 2 +- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index e88102b..ae4c681 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Requirements | Requirement | Version/Comment | |:---------------------------------|:----------------| -| Mirantis OpenStack compatibility | 7.0, 8.0 | +| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 | Installation Guide ================== @@ -43,7 +43,7 @@ To install Zabbix plugin, follow these steps: # fuel plugins id | name | version | package_version ---|-------------------|---------|---------------- - 1 | zabbix_monitoring | 2.5.0 | 3.0.0 + 1 | zabbix_monitoring | 2.6.0 | 3.0.0 For further details see the Zabbix Plugin Guide in the [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins) diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py index c936d32..244c8a9 100644 --- a/doc/plugin-guide/source/conf.py +++ b/doc/plugin-guide/source/conf.py @@ -57,9 +57,9 @@ author = u'Mirantis' # built documents. # # The short X.Y version. -version = '2.5.0' +version = '2.6' # The full version, including alpha/beta/rc tags. -release = '2.5.0' +release = '2.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst index 8dcfd22..fef4dea 100644 --- a/doc/plugin-guide/source/description.rst +++ b/doc/plugin-guide/source/description.rst @@ -10,15 +10,19 @@ services and APIs. Requirements ============ -================================== =============== +================================== ================ Requirement Version/Comment -================================== =============== -Fuel 7.0 and 8.0 -================================== =============== +================================== ================ +Fuel 7.0, 8.0 and 9.0 +================================== ================ Release Notes ============= +**2.6.0** + +* Compatibility with MOS 7.0, 8.0 and 9.0 + **2.5.0** * Service "zabbix_server" was restarted after executing of task "upload_core_repos" (bug 1529642_) diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 8a9ae84..ffa56d4 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -15,17 +15,17 @@ To install Zabbix plugin, follow these steps: that. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_monitoring-2.5-2.5.0-1.noarch.rpm root@:/tmp + # scp zabbix_monitoring-2.5-2.6.0-1.noarch.rpm root@:/tmp #. Log into the Fuel Master node. Install the plugin:: # cd /tmp - # fuel plugins --install zabbix_monitoring-2.5-2.5.0-1.noarch.rpm + # fuel plugins --install zabbix_monitoring-2.6-2.6.0-1.noarch.rpm #. Check if the plugin was installed successfully:: # fuel plugins id | name | version | package_version ---|---------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.5.0 | 3.0.0 + 1 | zabbix_monitoring | 2.6.0 | 3.0.0 diff --git a/doc/plugin-guide/source/removal.rst b/doc/plugin-guide/source/removal.rst index 0165298..7bc3c35 100644 --- a/doc/plugin-guide/source/removal.rst +++ b/doc/plugin-guide/source/removal.rst @@ -9,7 +9,7 @@ To uninstall Zabbix plugin, follow these steps: :: - # fuel plugins --remove zabbix_monitoring==2.5.0 + # fuel plugins --remove zabbix_monitoring==2.6.0 #. Check if the plugin was uninstalled successfully: diff --git a/doc/qa/source/conf.py b/doc/qa/source/conf.py index c936d32..244c8a9 100644 --- a/doc/qa/source/conf.py +++ b/doc/qa/source/conf.py @@ -57,9 +57,9 @@ author = u'Mirantis' # built documents. # # The short X.Y version. -version = '2.5.0' +version = '2.6' # The full version, including alpha/beta/rc tags. -release = '2.5.0' +release = '2.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/qa/source/test-strategy.rst b/doc/qa/source/test-strategy.rst index c18140f..3884f12 100644 --- a/doc/qa/source/test-strategy.rst +++ b/doc/qa/source/test-strategy.rst @@ -26,8 +26,8 @@ Product compatibility matrix +--------------------+-----------------+ | Product | Version/Comment | +====================+=================+ -| Mirantis OpenStack | 7.0 and 8.0 | +| Mirantis OpenStack | 7.0, 8.0 and 9.0| +--------------------+-----------------+ -| Zabbix monitoring | 2.5.0 or higher | +| Zabbix monitoring | 2.6.0 | +--------------------+-----------------+ diff --git a/specs/zabbix-plugin-spec.rst b/specs/zabbix-plugin-spec.rst index 8f9e33d..4698e02 100644 --- a/specs/zabbix-plugin-spec.rst +++ b/specs/zabbix-plugin-spec.rst @@ -118,7 +118,7 @@ Work Items Dependencies ============ -* Fuel 7.0 and 8.0 +* Fuel 7.0, 8.0 and 9.0 Testing =======