Revision 1187632

Jump to revision:
Author:	stroucki
Date:	Sat Oct 22 01:38:52 2011 UTC (12 years, 7 months ago)
Changed paths:	18
Log Message:	merge CMU branch with trunk

Changed paths

Path	Details
incubator/tashi/branches/cmu/	modified , props changed
incubator/tashi/branches/cmu/etc/TashiDefaults.cfg	modified , text changed
incubator/tashi/branches/cmu/etc/ZoniDefaults.cfg	modified , text changed
incubator/tashi/branches/cmu/src/tashi/agents/primitive.py	modified , text changed
incubator/tashi/branches/cmu/src/tashi/nodemanager/vmcontrol/qemu.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/bootstrap/pxe.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/client/zoni-cli.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/data/reservation.py (Copied from incubator/tashi/trunk/src/zoni/data/reservation.py, r1187508)	added
incubator/tashi/branches/cmu/src/zoni/data/reservationmanagementinterface.py (Copied from incubator/tashi/trunk/src/zoni/data/reservationmanagementinterface.py, r1187508)	added
incubator/tashi/branches/cmu/src/zoni/data/resourcequerysql.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/data/usermanagement.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/extra/util.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/hardware/dellswitch.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/install/db/zoniDbSetup.py	modified , text changed
incubator/tashi/branches/cmu/src/zoni/system/registration/register/register_automate	modified , text changed
incubator/tashi/branches/cmu/src/zoni/system/registration/register/register_node	modified , text changed
incubator/tashi/branches/cmu/src/zoni/system/registration/www/include/zoni_functions.php	modified , text changed
incubator/tashi/branches/cmu/src/zoni/system/registration/www/zoni-register.php	modified , text changed