Merge branch 'develop'

tourbillonpy · Dec 29, 2015 · d6b552b · d6b552b
2 parents d570d77 + d4694ab
commit d6b552b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -31,50 +31,51 @@ There are no special requirements to run tourbillon.
 
 ### Using distribution packages
 
-#### Debian/Ubuntu
+
+#### Ubuntu 14.04
 
 Download the debian package for your architecture:
 
 
-[tourbillon_0.4.1_amd64.deb](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon_0.4.1_amd64.deb)
+[tourbillon_0.4.2_amd64.deb](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon_0.4.2_amd64.deb)
 
-[tourbillon_0.4.1_i386.deb](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon_0.4.1_i386.deb)
+[tourbillon_0.4.2_i386.deb](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon_0.4.2_i386.deb)
 
 Run dpkg to install it:
 
 ```
-$ sudo dpkg -i tourbillon_0.4.1_amd64.deb
+$ sudo dpkg -i tourbillon_0.4.2_amd64.deb
 ```
 
 or for the 32 bit version:
 
 ```
-$ sudo dpkg -i tourbillon_0.4.1_i386.deb
+$ sudo dpkg -i tourbillon_0.4.2_i386.deb
 ```
 
 
 
-#### RHEL/Centos
+#### Centos 6.6
 
 
 Download the rpm package for your architecture:
 
 
-[tourbillon-0.4.1-1.x86_64.rpm](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon-0.4.1-1.x86_64.rpm)
+[tourbillon-0.4.2-1.x86_64.rpm](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon-0.4.2-1.x86_64.rpm)
 
-[tourbillon-0.4.1-1.i686.rpm](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon-0.4.1-1.i686.rpm)
+[tourbillon-0.4.2-1.i686.rpm](https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon-0.4.2-1.i686.rpm)
 
 
 Run rpm to install it:
 
 ```
-$ sudo rpm -i tourbillon-0.4.1-1.x86_64.rpm
+$ sudo rpm -i tourbillon-0.4.2-1.x86_64.rpm
 ```
 
 or for the 32 bit version:
 
 ```
-$ sudo rpm -i tourbillon-0.4.1-1.i686.rpm
+$ sudo rpm -i tourbillon-0.4.2-1.i686.rpm
 ```
 
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
+tourbillon-agent (0.4.2) stable; urgency=medium
+
+  * Fix influxDB client version
+
+ -- The Tourbillon Team <tourbillonpy@gmail.com>  Tue, 29 Dec 2015 15:42:00 +0000
+
 tourbillon-agent (0.4.1) stable; urgency=medium
 
   * Fix pip dependency 
 
- -- The Tourbillon Team <vagrant@vagrant-ubuntu-trusty-64>  Tue, 29 Dec 2015 09:52:55 +0000
+ -- The Tourbillon Team <tourbillonpy@gmail.com>  Tue, 29 Dec 2015 09:52:55 +0000
 
 tourbillon-agent (0.4) stable; urgency=medium
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.1'
+version = '0.4.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -4,8 +4,8 @@
    contain the root `toctree` directive.
 
 
-Welcome to tourbillon's documentation!
-======================================
+Welcome to tourbillon |release| documentation!
+==============================================
 
 tourbillon is an agent for collecting metrics from servers or services and store them into an InfluxDB.
 

diff --git a/doc/source/install.rst b/doc/source/install.rst
@@ -16,48 +16,48 @@ Using distribution packages
 ---------------------------
 
 
-Debian/Ubuntu
-^^^^^^^^^^^^^
+Ubuntu 14.04
+^^^^^^^^^^^^
 
 Download the debian package for your architecture:
 
 
-`tourbillon_0.4.1_amd64.deb <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon_0.4.1_amd64.deb>`_
+`tourbillon_0.4.2_amd64.deb <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon_0.4.2_amd64.deb>`_
 
-`tourbillon_0.4.1_i386.deb <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon_0.4.1_i386.deb>`_
+`tourbillon_0.4.2_i386.deb <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon_0.4.2_i386.deb>`_
 
 
 Run dpkg to install it: ::
 
-	$ sudo dpkg -i tourbillon_0.4.1_amd64.deb
+	$ sudo dpkg -i tourbillon_0.4.2_amd64.deb
 
 or for the 32 bit version: ::
 
-	$ sudo dpkg -i tourbillon_0.4.1_i386.deb
+	$ sudo dpkg -i tourbillon_0.4.2_i386.deb
 
 
 
 
 
-RHEL/Centos
-^^^^^^^^^^^
+Centos 6.6
+^^^^^^^^^^
 
 Download the rpm package for your architecture:
 
 
 
-`tourbillon-0.4.1-1.x86_64.rpm <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon-0.4.1-1.x86_64.rpm>`_
+`tourbillon-0.4.2-1.x86_64.rpm <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon-0.4.2-1.x86_64.rpm>`_
 
-`tourbillon-0.4.1-1.i686.rpm <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.1/tourbillon-0.4.1-1.i686.rpm>`_
+`tourbillon-0.4.2-1.i686.rpm <https://github.com/tourbillonpy/tourbillon-agent/releases/download/0.4.2/tourbillon-0.4.2-1.i686.rpm>`_
 
 
 Run rpm to install it: ::
 
-	$ sudo rpm -i tourbillon-0.4.1-1.x86_64.rpm
+	$ sudo rpm -i tourbillon-0.4.2-1.x86_64.rpm
 
 or for the 32 bit version: ::
 
-	$ sudo rpm -i tourbillon-0.4.1-1.i686.rpm
+	$ sudo rpm -i tourbillon-0.4.2-1.i686.rpm
 
 
 

diff --git a/redhat/tourbillon-rpm.json b/redhat/tourbillon-rpm.json
@@ -12,7 +12,7 @@
         "license": "ASF",
         "name": "tourbillon",
         "summary": "A Python agent for collecting metrics and store them into an InfluxDB.",
-        "version": "0.4.1",
+        "version": "0.4.2",
         "url": "https://github.com/tourbillon-python"
     },
     "python_venv": {

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 click==5.1
-influxdb==2.8.0
+influxdb==2.9.1
 trollius==2.0
 pip==7.1.2
diff --git a/setup.py b/setup.py
@@ -7,15 +7,15 @@
 exclude = ['tourbillon.agent.agent2'
            if PY34_PLUS else 'tourbillon.agent.agent']
 
-install_requires = ['influxdb>=2.8.0', 'click==5.1']
+install_requires = ['influxdb==2.9.1', 'click==5.1']
 
 if not PY34_PLUS:
     install_requires.append('trollius==2.0')
 
 
 setup(
     name='tourbillon',
-    version='0.4.1',
+    version='0.4.2',
     description='A Python agent for collecting metrics and store them into'
     ' an InfluxDB.',
     packages=find_packages(exclude=exclude),