From 314c383541bcfcd50cb4355ae0e4ddb4890526c7 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Wed, 16 Nov 2016 09:20:16 -0500 Subject: [PATCH] RIFT-14308 Meaningful logs while initalizing Openstack driver Original fix by: Ananda Baitharu Signed-off-by: Philip Joseph --- rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py index 2be896a5..9d5670ba 100644 --- a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py +++ b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py @@ -29,10 +29,13 @@ import rift.cal.rwcal_status as rwcal_status import rwlogger import neutronclient.common.exceptions as NeutronException import keystoneclient.exceptions as KeystoneExceptions +<<<<<<< 06b6ab4edf863c75fc6e2947ad52d1c76de1a308 import tornado import gi gi.require_version('RwSdn', '1.0') +======= +>>>>>>> RIFT-14308 Meaningful logs while initalizing Openstack driver from gi.repository import ( GObject, -- 2.25.1