From: Philip Joseph <philip.joseph@riftio.com>
Date: Wed, 16 Nov 2016 14:20:16 +0000 (-0500)
Subject: RIFT-14308 Meaningful logs  while initalizing Openstack driver
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F1167%2F1;p=osm%2FSO.git

RIFT-14308 Meaningful logs  while initalizing Openstack driver

Original fix by: Ananda Baitharu <ananda.baitharu@riftio.com>

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---

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,