commit 9ad46954d72a10274736ca123d3524547369f02d
author Philip Joseph <philip.joseph@riftio.com> Wed Nov 16 09:20:16 2016 -0500
committer Philip Joseph <philip.joseph@riftio.com> Thu Dec 29 13:26:41 2016 +0000
tree d7ff3ebae70f74d5fe6b0d95170f45d34cac297a
parent e04ea6a9ba1aa2adf45110589132d17a417384c2

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>

rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py

diff --git a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
index 8a4c337..8631ae2 100644
--- a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
+++ b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
@@ -29,10 +29,13 @@
 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,