Public Git Hosting - ganeti

commit	82dd78e2511a6d2093718d42b3008dca6694a7ca
author	Peter Krenesky <peter@osuosl.org>
	Mon, 23 May 2011 17:08:50 +0000 (23 10:08 -0700)
committer	Peter Krenesky <peter@osuosl.org>
	Mon, 23 May 2011 17:08:50 +0000 (23 10:08 -0700)
tree	dff5f754d79042e79ac8c01559c71260c7050666	tree \| snapshot (tar.gz zip)
parent	71d7a7a1a8b41b32daaca45c286f831093765241	commit \| diff
parent	ecbf62f77675a9c225e3625585cef50bf94fd393	commit \| diff

Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop

Conflicts:
ganeti/templates/ganeti/object_log/permissions/add_user.html
ganeti/templates/ganeti/object_log/permissions/modify_perms.html
ganeti/templates/ganeti/object_log/permissions/remove_user.html

It is mirror hosting of git://git.osuosl.org/gitolite/ganeti/ganeti_webmgr

RSS Atom

ganeti/templates/ganeti/object_log/permissions/add_user.html	diff1 \|	diff2 \|	blob \| history
ganeti/templates/ganeti/object_log/permissions/modify_perms.html	diff1 \|	diff2 \|	blob \| history
ganeti/templates/ganeti/object_log/permissions/remove_user.html	diff1 \|	diff2 \|	blob \| history
ganeti/urls.py	diff1 \|	diff2 \|	blob \| history
ganeti/views/cluster.py	diff1 \|	diff2 \|	blob \| history
templates/menu_base.html	diff1 \|	diff2 \|	blob \| history