Merge pull request #496 from grycap/devel

Set version num 1.6.5

IM/__init__.py

@@ -19,5 +19,5 @@
            'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry',
            'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPAdapter', 'uriparse',
            'VirtualMachine', 'VMRC', 'xmlobject']
-__version__ = '1.6.4'
+__version__ = '1.6.5'
 __author__ = 'Miguel Caballer'

changelog

@@ -358,3 +358,6 @@ IM 1.6.4
     * Decrease timeout getting ansible process results.
     * Enable to get the initial infrastructure contextualization log.
 
+IM 1.6.5
+    * Homogenize Inf ID log message
+    * Fix error cpu.count parameter is ignored in OpenStack conn.

docker-devel/Dockerfile

@@ -2,7 +2,7 @@
 FROM grycap/jenkins:ubuntu16.04-im
 ARG BRANCH=devel
 MAINTAINER Miguel Caballer <micafer1@upv.es>
-LABEL version="1.6.4"
+LABEL version="1.6.5"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 
 EXPOSE 8899 8800

docker/Dockerfile

@@ -1,7 +1,7 @@
 # Dockerfile to create a container with the IM service
 FROM ubuntu:16.04
 LABEL maintainer="Miguel Caballer <micafer1@upv.es>"
-LABEL version="1.6.4"
+LABEL version="1.6.5"
 LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
 EXPOSE 8899 8800
 
@@ -17,7 +17,7 @@ RUN pip install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-co
 # Install IM
 RUN apt-get update && apt-get install --no-install-recommends -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev && \
      pip install MySQL-python && \
-     pip install IM==1.6.4 && \
+     pip install IM==1.6.5 && \
      apt-get remove -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
      apt-get autoremove -y && \
      rm -rf /var/lib/apt/lists/*