Public Git Hosting - ganeti_webmgr.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 39eac62 e1d435e)

commit	f6600e5a6907f49b776ee0cec6fb5fc8f2c133e8
author	Peter Krenesky <peter@osuosl.org>
	Mon, 6 Jun 2011 20:30:59 +0000 (6 13:30 -0700)
committer	Peter Krenesky <peter@osuosl.org>
	Mon, 6 Jun 2011 20:30:59 +0000 (6 13:30 -0700)
tree	1fa522538f55e3652e59074b1ccfb3c201fa629c	tree \| snapshot (tar.gz zip)
parent	39eac622e9f4d28a9b4a62056e97fa0dd850bd25	commit \| diff
parent	e1d435ede0facfe7ed9ac6fc79fef0b9cda5444c	commit \| diff

Merge branch 'develop' into feature/app_rename

Conflicts:
ganeti_web/templates/virtual_machine/create_help.html

14 files changed:

ganeti_web/forms/virtual_machine.py	diff1 \|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm.html	\|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm_create.html	\|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm_edit.html	\|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm_edit_hvm.html	\|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm_edit_kvm.html	\|	diff2 \|	blob \| history
ganeti_web/templates/helptips/vm_edit_pvm.html	\|	diff2 \|	blob \| history
ganeti_web/templates/virtual_machine/create.html	diff1 \|	diff2 \|	blob \| history
ganeti_web/templates/virtual_machine/edit.html	diff1 \|	diff2 \|	blob \| history
ganeti_web/templates/virtual_machine/edit_hvm.html	diff1 \|	diff2 \|	blob \| history
ganeti_web/templates/virtual_machine/edit_pvm.html	diff1 \|	diff2 \|	blob \| history
ganeti_web/tests/views/virtual_machine/edit.py	diff1 \|	diff2 \|	blob \| history
ganeti_web/tests/views/virtual_machine/forms.py	diff1 \|	diff2 \|	blob \| history
ganeti_web/views/virtual_machine.py	diff1 \|	diff2 \|	blob \| history

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