Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorjavier <javier.garcial.external@atos.net>
Mon, 16 Jun 2014 08:17:06 +0000 (10:17 +0200)
committerjavier <javier.garcial.external@atos.net>
Mon, 16 Jun 2014 08:17:06 +0000 (10:17 +0200)
commitba476841726dc818c0efd3ed25e42955a39fc504
tree1e04ed2908d9ac27c5069b504ede6723ca39ae57
parentc99f1bd98ff355bd3f63b4929739ea5bd92cd6a3
parenta6cf3aa35b1ea108c2b181f7d73262113441c78c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
plugins/queryupdater/static/js/queryupdater.js
portal/sliceresourceview.py
portal/templates/fed4fire/fed4fire_widget-slice-sections.html

jgarcia - Commit after merging HEAD files and SLA & Service Directory code
myslice/urls.py
plugins/queryupdater/static/js/queryupdater.js
portal/sliceresourceview.py
portal/templates/_widget-slice-sections.html
portal/templates/fed4fire/fed4fire_widget-slice-sections.html
portal/templates/fed4fire/fed4fire_widget-topmenu.html
portal/templates/slice-resource-view.html
portal/templates/slice-view.html