git.onelab.eu Git - monitor.git/commit

git://git.onelab.eu / monitor.git / commit

author	Stephen Soltesz <soltesz@cs.princeton.edu>
	Mon, 27 Apr 2009 21:31:50 +0000 (21:31 +0000)
committer	Stephen Soltesz <soltesz@cs.princeton.edu>
	Mon, 27 Apr 2009 21:31:50 +0000 (21:31 +0000)
commit	334378a14103c3fd02332b6ce3767553f1fe11d2
tree	6dad3cdf5a8a3b4d12fbc2c6612131e882918b2e	tree \| snapshot
parent	486326759a86f1315d93aeaccf6e2641af2bd9d9	commit \| diff

pull in additional changes from 2.0 branch.
svn merge -r 13116:13242 https://svn.planet-lab.org/svn/Monitor/branches/2.0/

48 files changed:

Monitor.spec		diff \| blob \| history
bootman.py		diff \| blob \| history
monitor-server.init		diff \| blob \| history
monitor/Rpyc/AsyncNetProxy.py	[moved from Rpyc/AsyncNetProxy.py with 100% similarity]	blob \| history
monitor/Rpyc/Authentication.py	[moved from Rpyc/Authentication.py with 100% similarity]	blob \| history
monitor/Rpyc/Boxing.py	[moved from Rpyc/Boxing.py with 100% similarity]	blob \| history
monitor/Rpyc/Channel.py	[moved from Rpyc/Channel.py with 100% similarity]	blob \| history
monitor/Rpyc/Connection.py	[moved from Rpyc/Connection.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/__init__.py	[moved from Rpyc/Demo/__init__.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-1.py	[moved from Rpyc/Demo/demo-1.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-2.py	[moved from Rpyc/Demo/demo-2.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-3.py	[moved from Rpyc/Demo/demo-3.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-4.py	[moved from Rpyc/Demo/demo-4.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-5.py	[moved from Rpyc/Demo/demo-5.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/demo-6.py	[moved from Rpyc/Demo/demo-6.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/pipe-child.py	[moved from Rpyc/Demo/pipe-child.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/pipe-parent.py	[moved from Rpyc/Demo/pipe-parent.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/testmodule.py	[moved from Rpyc/Demo/testmodule.py with 100% similarity]	blob \| history
monitor/Rpyc/Demo/testsuite.bat	[moved from Rpyc/Demo/testsuite.bat with 100% similarity]	blob \| history
monitor/Rpyc/Factories.py	[moved from Rpyc/Factories.py with 100% similarity]	blob \| history
monitor/Rpyc/Lib.py	[moved from Rpyc/Lib.py with 100% similarity]	blob \| history
monitor/Rpyc/ModuleNetProxy.py	[moved from Rpyc/ModuleNetProxy.py with 100% similarity]	blob \| history
monitor/Rpyc/NetProxy.py	[moved from Rpyc/NetProxy.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/ServerUtils.py	[moved from Rpyc/Servers/ServerUtils.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/__init__.py	[moved from Rpyc/Servers/__init__.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/auth_server.py	[moved from Rpyc/Servers/auth_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/forking_server.py	[moved from Rpyc/Servers/forking_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/selecting_server.py	[moved from Rpyc/Servers/selecting_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/simple_server.py	[moved from Rpyc/Servers/simple_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/std_server.py	[moved from Rpyc/Servers/std_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Servers/threaded_server.py	[moved from Rpyc/Servers/threaded_server.py with 100% similarity]	blob \| history
monitor/Rpyc/Stream.py	[moved from Rpyc/Stream.py with 100% similarity]	blob \| history
monitor/Rpyc/Utils.py	[moved from Rpyc/Utils.py with 100% similarity]	blob \| history
monitor/Rpyc/__init__.py	[moved from Rpyc/__init__.py with 100% similarity]	blob \| history
monitor/Rpyc/changelog.txt	[moved from Rpyc/changelog.txt with 100% similarity]	blob \| history
monitor/bootman.py	[new file with mode: 0755]	blob
monitor/database/dborm.py		diff \| blob \| history
monitor/database/zabbixapi/model.py		diff \| blob \| history
monitor/getconf.py	[new file with mode: 0755]	blob
monitor/getsshkeys.py	[new file with mode: 0755]	blob
monitor/nodeconfig.py	[new file with mode: 0755]	blob
monitor/wrapper/plccache.py		diff \| blob \| history
nodeconfig.py		diff \| blob \| history
pcucontrol/models/BayTech.py		diff \| blob \| history
pcucontrol/models/IPAL.py		diff \| blob \| history
policy.py		diff \| blob \| history
setup.py		diff \| blob \| history
web/MonitorWeb/monitorweb/controllers.py		diff \| blob \| history

monitor

RSS Atom