Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 3 Oct 2014 20:19:32 +0000 (17:19 -0300)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 3 Oct 2014 20:19:32 +0000 (17:19 -0300)
commite45ccc4c4c327a81cc6a001ceff0655358ea09c5
tree3ae45c429ed93a6b8c4afd0940afa62de48ee3bb
parente494918d8e6d9dab21b9ff30c3c2db2157dc0a20
parent6a3f5d4949171451d5df2df5d0f96e9eb396f29c
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
portal/actions.py
portal/sliceresourceview.py