You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2011/11/18 21:17:23 UTC
svn commit: r1203845 - in /incubator/tashi/trunk: ./ doc/ etc/ scripts/ src/
src/tashi/ src/tashi/agents/ src/tashi/aws/ src/tashi/aws/impl/
src/tashi/aws/wsdl/ src/tashi/client/ src/tashi/clustermanager/
src/tashi/clustermanager/data/ src/tashi/dfs/ s...
Author: stroucki
Date: Fri Nov 18 21:17:19 2011
New Revision: 1203845
URL: http://svn.apache.org/viewvc?rev=1203845&view=rev
Log:
undo r1203836 which blew away the trunk >-(
Added:
incubator/tashi/trunk/ (props changed)
- copied from r1203835, incubator/tashi/trunk/
incubator/tashi/trunk/LICENSE
- copied unchanged from r1203835, incubator/tashi/trunk/LICENSE
incubator/tashi/trunk/Makefile
- copied unchanged from r1203835, incubator/tashi/trunk/Makefile
incubator/tashi/trunk/NOTICE
- copied unchanged from r1203835, incubator/tashi/trunk/NOTICE
incubator/tashi/trunk/README
- copied unchanged from r1203835, incubator/tashi/trunk/README
incubator/tashi/trunk/doc/
- copied from r1203835, incubator/tashi/trunk/doc/
incubator/tashi/trunk/doc/DEVELOPMENT
- copied unchanged from r1203835, incubator/tashi/trunk/doc/DEVELOPMENT
incubator/tashi/trunk/etc/
- copied from r1203835, incubator/tashi/trunk/etc/
incubator/tashi/trunk/etc/NodeManager.cfg
- copied unchanged from r1203835, incubator/tashi/trunk/etc/NodeManager.cfg
incubator/tashi/trunk/etc/TashiDefaults.cfg
- copied unchanged from r1203835, incubator/tashi/trunk/etc/TashiDefaults.cfg
incubator/tashi/trunk/etc/TestConfig.cfg
- copied unchanged from r1203835, incubator/tashi/trunk/etc/TestConfig.cfg
incubator/tashi/trunk/etc/ZoniDefaults.cfg
- copied unchanged from r1203835, incubator/tashi/trunk/etc/ZoniDefaults.cfg
incubator/tashi/trunk/scripts/
- copied from r1203835, incubator/tashi/trunk/scripts/
incubator/tashi/trunk/scripts/create
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/create
incubator/tashi/trunk/scripts/demo-yahoo-08-14-08
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/demo-yahoo-08-14-08
incubator/tashi/trunk/scripts/mryan3-database-setup
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/mryan3-database-setup
incubator/tashi/trunk/scripts/resume
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/resume
incubator/tashi/trunk/scripts/stress
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/stress
incubator/tashi/trunk/scripts/tomer-database-setup
- copied unchanged from r1203835, incubator/tashi/trunk/scripts/tomer-database-setup
incubator/tashi/trunk/src/
- copied from r1203835, incubator/tashi/trunk/src/
incubator/tashi/trunk/src/tashi/
- copied from r1203835, incubator/tashi/trunk/src/tashi/
incubator/tashi/trunk/src/tashi/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/__init__.py
incubator/tashi/trunk/src/tashi/agents/
- copied from r1203835, incubator/tashi/trunk/src/tashi/agents/
incubator/tashi/trunk/src/tashi/agents/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/__init__.py
incubator/tashi/trunk/src/tashi/agents/dhcpdns.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/dhcpdns.py
incubator/tashi/trunk/src/tashi/agents/instancehook.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/instancehook.py
incubator/tashi/trunk/src/tashi/agents/locality-server.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/locality-server.py
incubator/tashi/trunk/src/tashi/agents/mauipacket.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/mauipacket.py
incubator/tashi/trunk/src/tashi/agents/mauiwiki.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/mauiwiki.py
incubator/tashi/trunk/src/tashi/agents/primitive.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/primitive.py
incubator/tashi/trunk/src/tashi/agents/primitive_zoni.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/primitive_zoni.py
incubator/tashi/trunk/src/tashi/agents/pseudoDes.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/agents/pseudoDes.py
incubator/tashi/trunk/src/tashi/aws/
- copied from r1203835, incubator/tashi/trunk/src/tashi/aws/
incubator/tashi/trunk/src/tashi/aws/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/__init__.py
incubator/tashi/trunk/src/tashi/aws/impl/
- copied from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/
incubator/tashi/trunk/src/tashi/aws/impl/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/__init__.py
incubator/tashi/trunk/src/tashi/aws/impl/address.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/address.py
incubator/tashi/trunk/src/tashi/aws/impl/bundle.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/bundle.py
incubator/tashi/trunk/src/tashi/aws/impl/images.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/images.py
incubator/tashi/trunk/src/tashi/aws/impl/instances.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/instances.py
incubator/tashi/trunk/src/tashi/aws/impl/keys.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/keys.py
incubator/tashi/trunk/src/tashi/aws/impl/location.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/location.py
incubator/tashi/trunk/src/tashi/aws/impl/monitor.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/monitor.py
incubator/tashi/trunk/src/tashi/aws/impl/other.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/other.py
incubator/tashi/trunk/src/tashi/aws/impl/reservation.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/reservation.py
incubator/tashi/trunk/src/tashi/aws/impl/security.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/security.py
incubator/tashi/trunk/src/tashi/aws/impl/volume.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/impl/volume.py
incubator/tashi/trunk/src/tashi/aws/query.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/query.py
incubator/tashi/trunk/src/tashi/aws/soap.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/soap.py
incubator/tashi/trunk/src/tashi/aws/trans.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/trans.py
incubator/tashi/trunk/src/tashi/aws/util.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/util.py
incubator/tashi/trunk/src/tashi/aws/wsdl/
- copied from r1203835, incubator/tashi/trunk/src/tashi/aws/wsdl/
incubator/tashi/trunk/src/tashi/aws/wsdl/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/aws/wsdl/__init__.py
incubator/tashi/trunk/src/tashi/client/
- copied from r1203835, incubator/tashi/trunk/src/tashi/client/
incubator/tashi/trunk/src/tashi/client/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/client/__init__.py
incubator/tashi/trunk/src/tashi/client/client.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/client/client.py
incubator/tashi/trunk/src/tashi/client/tashi-client.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/client/tashi-client.py
incubator/tashi/trunk/src/tashi/client/test.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/client/test.py
incubator/tashi/trunk/src/tashi/clustermanager/
- copied from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/
incubator/tashi/trunk/src/tashi/clustermanager/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/__init__.py
incubator/tashi/trunk/src/tashi/clustermanager/clustermanager.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/clustermanager.py
incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
incubator/tashi/trunk/src/tashi/clustermanager/data/
- copied from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/
incubator/tashi/trunk/src/tashi/clustermanager/data/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/__init__.py
incubator/tashi/trunk/src/tashi/clustermanager/data/datainterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/datainterface.py
incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py
incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py
incubator/tashi/trunk/src/tashi/clustermanager/data/ldapoverride.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/ldapoverride.py
incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/pickled.py
incubator/tashi/trunk/src/tashi/clustermanager/data/sql.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/clustermanager/data/sql.py
incubator/tashi/trunk/src/tashi/connectionmanager.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/connectionmanager.py
incubator/tashi/trunk/src/tashi/dfs/
- copied from r1203835, incubator/tashi/trunk/src/tashi/dfs/
incubator/tashi/trunk/src/tashi/dfs/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/dfs/__init__.py
incubator/tashi/trunk/src/tashi/dfs/dfsinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/dfs/dfsinterface.py
incubator/tashi/trunk/src/tashi/dfs/vfs.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/dfs/vfs.py
incubator/tashi/trunk/src/tashi/messaging/
- copied from r1203835, incubator/tashi/trunk/src/tashi/messaging/
incubator/tashi/trunk/src/tashi/messaging/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/__init__.py
incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/gangliapublisher.py
incubator/tashi/trunk/src/tashi/messaging/messageBroker.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/messageBroker.py
incubator/tashi/trunk/src/tashi/messaging/messaging.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/messaging.py
incubator/tashi/trunk/src/tashi/messaging/messagingloghandler.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/messagingloghandler.py
incubator/tashi/trunk/src/tashi/messaging/soapmessaging.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/soapmessaging.py
incubator/tashi/trunk/src/tashi/messaging/tashimessaging.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/tashimessaging.py
incubator/tashi/trunk/src/tashi/messaging/threadpool.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/threadpool.py
incubator/tashi/trunk/src/tashi/messaging/thriftmessaging.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/messaging/thriftmessaging.py
incubator/tashi/trunk/src/tashi/nodemanager/
- copied from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/
incubator/tashi/trunk/src/tashi/nodemanager/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/__init__.py
incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/nodemanager.py
incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/
- copied from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/__init__.py
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/vmcontrolinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/vmcontrolinterface.py
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
incubator/tashi/trunk/src/tashi/parallel.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/parallel.py
incubator/tashi/trunk/src/tashi/rpycservices/
- copied from r1203835, incubator/tashi/trunk/src/tashi/rpycservices/
incubator/tashi/trunk/src/tashi/rpycservices/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/rpycservices/__init__.py
incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/rpycservices/rpycservices.py
incubator/tashi/trunk/src/tashi/rpycservices/rpyctypes.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/rpycservices/rpyctypes.py
incubator/tashi/trunk/src/tashi/thrift/
- copied from r1203835, incubator/tashi/trunk/src/tashi/thrift/
incubator/tashi/trunk/src/tashi/thrift/build.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/thrift/build.py
incubator/tashi/trunk/src/tashi/thrift/layoutlocality.thrift
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/thrift/layoutlocality.thrift
incubator/tashi/trunk/src/tashi/thrift/messagingthrift.thrift
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/thrift/messagingthrift.thrift
incubator/tashi/trunk/src/tashi/thrift/services.thrift
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/thrift/services.thrift
incubator/tashi/trunk/src/tashi/util.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/util.py
incubator/tashi/trunk/src/tashi/version.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/tashi/version.py
incubator/tashi/trunk/src/utils/
- copied from r1203835, incubator/tashi/trunk/src/utils/
incubator/tashi/trunk/src/utils/Makefile
- copied unchanged from r1203835, incubator/tashi/trunk/src/utils/Makefile
incubator/tashi/trunk/src/utils/getLocality.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/utils/getLocality.py
incubator/tashi/trunk/src/utils/nmd.c
- copied unchanged from r1203835, incubator/tashi/trunk/src/utils/nmd.c
incubator/tashi/trunk/src/utils/nmd.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/utils/nmd.py
incubator/tashi/trunk/src/zoni/
- copied from r1203835, incubator/tashi/trunk/src/zoni/
incubator/tashi/trunk/src/zoni/Makefile
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/Makefile
incubator/tashi/trunk/src/zoni/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/__init__.py
incubator/tashi/trunk/src/zoni/agents/
- copied from r1203835, incubator/tashi/trunk/src/zoni/agents/
incubator/tashi/trunk/src/zoni/agents/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/agents/__init__.py
incubator/tashi/trunk/src/zoni/agents/dhcpdns.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/agents/dhcpdns.py
incubator/tashi/trunk/src/zoni/bootstrap/
- copied from r1203835, incubator/tashi/trunk/src/zoni/bootstrap/
incubator/tashi/trunk/src/zoni/bootstrap/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/bootstrap/__init__.py
incubator/tashi/trunk/src/zoni/bootstrap/bootstrapinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/bootstrap/bootstrapinterface.py
incubator/tashi/trunk/src/zoni/bootstrap/pxe.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/bootstrap/pxe.py
incubator/tashi/trunk/src/zoni/client/
- copied from r1203835, incubator/tashi/trunk/src/zoni/client/
incubator/tashi/trunk/src/zoni/client/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/client/__init__.py
incubator/tashi/trunk/src/zoni/client/zoni-cli.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/client/zoni-cli.py
incubator/tashi/trunk/src/zoni/data/
- copied from r1203835, incubator/tashi/trunk/src/zoni/data/
incubator/tashi/trunk/src/zoni/data/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/__init__.py
incubator/tashi/trunk/src/zoni/data/infostore.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/infostore.py
incubator/tashi/trunk/src/zoni/data/reservation.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/reservation.py
incubator/tashi/trunk/src/zoni/data/reservationmanagementinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/reservationmanagementinterface.py
incubator/tashi/trunk/src/zoni/data/resourcequerysql.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/resourcequerysql.py
incubator/tashi/trunk/src/zoni/data/usermanagement.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/usermanagement.py
incubator/tashi/trunk/src/zoni/data/usermanagementinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/data/usermanagementinterface.py
incubator/tashi/trunk/src/zoni/extra/
- copied from r1203835, incubator/tashi/trunk/src/zoni/extra/
incubator/tashi/trunk/src/zoni/extra/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/extra/__init__.py
incubator/tashi/trunk/src/zoni/extra/util.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/extra/util.py
incubator/tashi/trunk/src/zoni/hardware/
- copied from r1203835, incubator/tashi/trunk/src/zoni/hardware/
incubator/tashi/trunk/src/zoni/hardware/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/__init__.py
incubator/tashi/trunk/src/zoni/hardware/apcswitchedrackpdu.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/apcswitchedrackpdu.py
incubator/tashi/trunk/src/zoni/hardware/delldrac.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/delldrac.py
incubator/tashi/trunk/src/zoni/hardware/dellswitch.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/dellswitch.py
incubator/tashi/trunk/src/zoni/hardware/f10s50switch.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/f10s50switch.py
incubator/tashi/trunk/src/zoni/hardware/hpilo.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/hpilo.py
incubator/tashi/trunk/src/zoni/hardware/hpswitch.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/hpswitch.py
incubator/tashi/trunk/src/zoni/hardware/hwswitchinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/hwswitchinterface.py
incubator/tashi/trunk/src/zoni/hardware/ipmi.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/ipmi.py
incubator/tashi/trunk/src/zoni/hardware/raritanpdu.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/raritanpdu.py
incubator/tashi/trunk/src/zoni/hardware/systemmanagement.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/systemmanagement.py
incubator/tashi/trunk/src/zoni/hardware/systemmanagementinterface.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/hardware/systemmanagementinterface.py
incubator/tashi/trunk/src/zoni/install/
- copied from r1203835, incubator/tashi/trunk/src/zoni/install/
incubator/tashi/trunk/src/zoni/install/db/
- copied from r1203835, incubator/tashi/trunk/src/zoni/install/db/
incubator/tashi/trunk/src/zoni/install/db/zoniDbSetup.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/db/zoniDbSetup.py
incubator/tashi/trunk/src/zoni/install/dnsdhcp/
- copied from r1203835, incubator/tashi/trunk/src/zoni/install/dnsdhcp/
incubator/tashi/trunk/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/dnsdhcp/zoniDnsDhcpSetup.py
incubator/tashi/trunk/src/zoni/install/pxe/
- copied from r1203835, incubator/tashi/trunk/src/zoni/install/pxe/
incubator/tashi/trunk/src/zoni/install/pxe/base-menu
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/pxe/base-menu
incubator/tashi/trunk/src/zoni/install/pxe/base.zoni
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/pxe/base.zoni
incubator/tashi/trunk/src/zoni/install/pxe/zoniPxeSetup.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/pxe/zoniPxeSetup.py
incubator/tashi/trunk/src/zoni/install/pxe/zoni_pxe.jpg
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/pxe/zoni_pxe.jpg
incubator/tashi/trunk/src/zoni/install/www/
- copied from r1203835, incubator/tashi/trunk/src/zoni/install/www/
incubator/tashi/trunk/src/zoni/install/www/zoniWebSetup.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/install/www/zoniWebSetup.py
incubator/tashi/trunk/src/zoni/services/
- copied from r1203835, incubator/tashi/trunk/src/zoni/services/
incubator/tashi/trunk/src/zoni/services/__init__.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/services/__init__.py
incubator/tashi/trunk/src/zoni/services/pcvciservice.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/services/pcvciservice.py
incubator/tashi/trunk/src/zoni/services/rpycservices.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/services/rpycservices.py
incubator/tashi/trunk/src/zoni/services/zonimanager.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/services/zonimanager.py
incubator/tashi/trunk/src/zoni/system/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/
incubator/tashi/trunk/src/zoni/system/initrd/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/initrd/
incubator/tashi/trunk/src/zoni/system/registration/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/registration/
incubator/tashi/trunk/src/zoni/system/registration/register/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/registration/register/
incubator/tashi/trunk/src/zoni/system/registration/register/register_automate
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/system/registration/register/register_automate
incubator/tashi/trunk/src/zoni/system/registration/register/register_node
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/system/registration/register/register_node
incubator/tashi/trunk/src/zoni/system/registration/www/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/registration/www/
incubator/tashi/trunk/src/zoni/system/registration/www/include/
- copied from r1203835, incubator/tashi/trunk/src/zoni/system/registration/www/include/
incubator/tashi/trunk/src/zoni/system/registration/www/include/zoni_functions.php
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/system/registration/www/include/zoni_functions.php
incubator/tashi/trunk/src/zoni/system/registration/www/zoni-register.php
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/system/registration/www/zoni-register.php
incubator/tashi/trunk/src/zoni/version.py
- copied unchanged from r1203835, incubator/tashi/trunk/src/zoni/version.py
Propchange: incubator/tashi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 18 21:17:19 2011
@@ -0,0 +1,2 @@
+/incubator/tashi/branches/cmu:1178106-1187632
+/incubator/tashi/branches/zoni-dev/trunk:1034098-1177646