hope I got the merge wright...
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 14 Dec 2009 15:57:04 +0000 (15:57 +0000)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 14 Dec 2009 15:57:04 +0000 (15:57 +0000)
commite637272100e8e03884188cb2118b21158e739bb0
tree2039c489a5748f62f0e946167535709ec5883e4d
parent328ee7b92f4e23570d8a33ad9244413ae3aee6bf
hope I got the merge wright...
svn merge -r 15903:16132 https://svn.planet-lab.org/svn/Monitor/branches/monitor-20091130 .
90 files changed:
Monitor.spec
Rpyc/AsyncNetProxy.py [deleted file]
Rpyc/Authentication.py [deleted file]
Rpyc/Boxing.py [deleted file]
Rpyc/Channel.py [deleted file]
Rpyc/Connection.py [deleted file]
Rpyc/Demo/__init__.py [deleted file]
Rpyc/Demo/demo-1.py [deleted file]
Rpyc/Demo/demo-2.py [deleted file]
Rpyc/Demo/demo-3.py [deleted file]
Rpyc/Demo/demo-4.py [deleted file]
Rpyc/Demo/demo-5.py [deleted file]
Rpyc/Demo/demo-6.py [deleted file]
Rpyc/Demo/pipe-child.py [deleted file]
Rpyc/Demo/pipe-parent.py [deleted file]
Rpyc/Demo/testmodule.py [deleted file]
Rpyc/Demo/testsuite.bat [deleted file]
Rpyc/Factories.py [deleted file]
Rpyc/Lib.py [deleted file]
Rpyc/ModuleNetProxy.py [deleted file]
Rpyc/NetProxy.py [deleted file]
Rpyc/Servers/ServerUtils.py [deleted file]
Rpyc/Servers/__init__.py [deleted file]
Rpyc/Servers/auth_server.py [deleted file]
Rpyc/Servers/forking_server.py [deleted file]
Rpyc/Servers/selecting_server.py [deleted file]
Rpyc/Servers/simple_server.py [deleted file]
Rpyc/Servers/std_server.py [deleted file]
Rpyc/Servers/threaded_server.py [deleted file]
Rpyc/Stream.py [deleted file]
Rpyc/Utils.py [deleted file]
Rpyc/__init__.py [deleted file]
Rpyc/changelog.txt [deleted file]
automate-default.sh
commands/blacklist.py [moved from blacklist.py with 87% similarity]
commands/bootman.py [moved from bootman.py with 100% similarity]
commands/checksync.py [moved from checksync.py with 100% similarity]
commands/comonquery.py [moved from comonquery.py with 100% similarity]
commands/findall.py [moved from findall.py with 100% similarity]
commands/findbad.py [moved from findbad.py with 100% similarity]
commands/findbadpcu.py [moved from findbadpcu.py with 100% similarity]
commands/nodebad.py [moved from nodebad.py with 100% similarity]
commands/nodeconfig.py [moved from nodeconfig.py with 100% similarity]
commands/nodegroups.py [moved from nodegroups.py with 100% similarity]
commands/nodeinfo.py [moved from nodeinfo.py with 100% similarity]
commands/nodequery.py [moved from nodequery.py with 100% similarity]
commands/pcubad.py [moved from pcubad.py with 100% similarity]
commands/pcuinfo.py [moved from pcuinfo.py with 100% similarity]
commands/plcquery.py [moved from plcquery.py with 100% similarity]
commands/policy.py [moved from policy.py with 100% similarity]
commands/reboot.py [new file with mode: 0755]
commands/shconfig.py [moved from shconfig.py with 100% similarity]
commands/sitebad.py [moved from sitebad.py with 100% similarity]
commands/siteinfo.py [moved from siteinfo.py with 100% similarity]
commands/siteleave.py [moved from siteleave.py with 100% similarity]
commands/syncwithplc.py [moved from syncwithplc.py with 100% similarity]
docs/model.txt [moved from model.txt with 100% similarity]
getsshkeys.py [deleted file]
monitor-default.conf
monitor-server.init
monitor/bootman.py
monitor/database/info/__init__.py
monitor/database/info/version.py [new file with mode: 0644]
monitor/monitor_version.py [new file with mode: 0644]
monitor/reboot.py
monitor/util/__init__.py
monitor/util/sshknownhosts.py [moved from monitor/getsshkeys.py with 96% similarity]
rt_db [deleted file]
setup.py
tools/automate/automate.py [moved from automate/automate.py with 100% similarity]
tools/automate/fetch.py [moved from automate/fetch.py with 100% similarity]
tools/automate/query.py [moved from automate/query.py with 100% similarity]
tools/automate/vxargs.py [moved from automate/vxargs.py with 100% similarity]
tools/extra/nodeaction.py [moved from extra/nodeaction.py with 100% similarity]
tools/extra/nodediff.py [moved from extra/nodediff.py with 100% similarity]
tools/extra/nodehistory.py [moved from extra/nodehistory.py with 100% similarity]
tools/extra/nodesets.py [moved from extra/nodesets.py with 100% similarity]
tools/extra/pcutest.py [moved from extra/pcutest.py with 100% similarity]
tools/extra/pkl2php.py [moved from extra/pkl2php.py with 100% similarity]
tools/extra/prep_power_users.py [moved from extra/prep_power_users.py with 100% similarity]
tools/extra/printpdb.py [moved from extra/printpdb.py with 100% similarity]
tools/extra/showlatlon.py [moved from extra/showlatlon.py with 100% similarity]
tools/extra/template.py [moved from extra/template.py with 100% similarity]
tools/getsshkeys.py [new file with mode: 0755]
tools/kill.cmd.sh [moved from kill.cmd.sh with 100% similarity]
tools/plc2nagios.py [moved from nagios/plc2nagios.py with 100% similarity]
tools/setup-agent.sh [moved from setup-agent.sh with 100% similarity]
tools/testapi.py [moved from testapi.py with 100% similarity]
tools/timeout.pl [moved from timeout.pl with 100% similarity]
web/monitorweb-httpd.conf