Merge branch 'v1.1' 80/1080/2
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 8 Feb 2017 13:21:28 +0000 (14:21 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 8 Feb 2017 14:58:37 +0000 (15:58 +0100)
commitc1d1d47cee5bd382fd9e2ca4d829aef0f545a0d1
tree9ff2bc301b4b3f1c52abce9ddd3c0373afc313fb
parente9317ff999987c09369b9eab6bcd044ced8f1048
parent3043d13cc7d1496cd9bdb7a456f12c9fffc25287
Merge branch 'v1.1'

Change-Id: I0c27f01914959623bf25905786af9e7dabc141b6
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
database_utils/migrate_vim_db.sh
host_thread.py
httpserver.py
openvimd.cfg
openvimd.py
vim_db.py