From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 27 Mar 2014 10:51:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~170^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=be718e3336ee7ad98e90b0b3c97b58b37a467788

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

be718e3336ee7ad98e90b0b3c97b58b37a467788
diff --cc portal/sliceresourceview.py
index bdffa3fe,3ba1084c..7d4ab089
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@@ -17,8 -17,9 +17,9 @@@ from plugins.querytable              im
  from plugins.googlemap               import GoogleMap
  from plugins.queryupdater            import QueryUpdater
  from plugins.testbeds                import TestbedsPlugin
+ from plugins.scheduler2              import Scheduler2
  
 -from theme import ThemeView
 +from myslice.theme import ThemeView
  
  class SliceResourceView (LoginRequiredView, ThemeView):
      template_name = "slice-resource-view.html"