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

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

author	Stephen Soltesz <soltesz@cs.princeton.edu>
	Thu, 16 Apr 2009 19:17:37 +0000 (19:17 +0000)
committer	Stephen Soltesz <soltesz@cs.princeton.edu>
	Thu, 16 Apr 2009 19:17:37 +0000 (19:17 +0000)
commit	c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad
tree	4e8b0cbd76c3a41023145b48d9cf56cd556dc84c	tree \| snapshot
parent	c678c008f0c3a10947b38880e52005a856e1b122	commit \| diff

svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/

copying all monitor2 changes back into trunk to begin
updates for 4.3 and updates to sortable columns.

59 files changed:

Makefile		diff \| blob \| history
automate-default.sh		diff \| blob \| history
blacklist.py		diff \| blob \| history
bootman.py		diff \| blob \| history
findall.py		diff \| blob \| history
findbad.py		diff \| blob \| history
findbadpcu.py		diff \| blob \| history
get_metasite_nodes.py		diff \| blob \| history
grouprins.py	[deleted file]	blob \| history
mailmonitor.py		diff \| blob \| history
monitor/common.py		diff \| blob \| history
monitor/database/info/__init__.py		diff \| blob \| history
monitor/database/info/action.py		diff \| blob \| history
monitor/database/info/findbad.py		diff \| blob \| history
monitor/database/info/history.py		diff \| blob \| history
monitor/database/info/interface.py	[new file with mode: 0644]	blob
monitor/database/info/model.py		diff \| blob \| history
monitor/database/info/plc.py	[new file with mode: 0644]	blob
monitor/model.py		diff \| blob \| history
monitor/policy.py		diff \| blob \| history
monitor/reboot.py	[new file with mode: 0755]	blob
monitor/scanapi.py		diff \| blob \| history
monitor/wrapper/emailTxt.py		diff \| blob \| history
monitor/wrapper/plc.py		diff \| blob \| history
monitor/wrapper/plccache.py		diff \| blob \| history
nodebad.py		diff \| blob \| history
nodegroups.py		diff \| blob \| history
nodeinfo.py		diff \| blob \| history
nodequery.py		diff \| blob \| history
pcubad.py		diff \| blob \| history
pcucontrol/models/APCControl.py		diff \| blob \| history
pcucontrol/models/BayTech.py		diff \| blob \| history
pcucontrol/models/DRAC.py		diff \| blob \| history
pcucontrol/models/HPiLO.py		diff \| blob \| history
pcucontrol/models/IPAL.py		diff \| blob \| history
pcucontrol/models/ePowerSwitch.py		diff \| blob \| history
pcucontrol/models/intelamt/RemoteControlSample.cpp		diff \| blob \| history
pcucontrol/reboot.py		diff \| blob \| history
pcucontrol/util/__init__.py	[new file with mode: 0644]	blob
pcucontrol/util/command.py	[moved from monitor/util/command.py with 71% similarity]	diff \| blob \| history
policy.py	[new file with mode: 0755]	blob
setup.py		diff \| blob \| history
sitebad.py		diff \| blob \| history
siteinfo.py		diff \| blob \| history
testapi.py		diff \| blob \| history
tests/nodenetwork.py	[moved from nodenetwork.py with 100% similarity]	blob \| history
web/MonitorWeb/monitorweb/controllers.py		diff \| blob \| history
web/MonitorWeb/monitorweb/monitor_xmlrpc.py	[new file with mode: 0644]	blob
web/MonitorWeb/monitorweb/static/css/style.css		diff \| blob \| history
web/MonitorWeb/monitorweb/templates/links.py		diff \| blob \| history
web/MonitorWeb/monitorweb/templates/nodehistory.kid	[new file with mode: 0644]	blob
web/MonitorWeb/monitorweb/templates/nodelist.kid		diff \| blob \| history
web/MonitorWeb/monitorweb/templates/pcuview.kid		diff \| blob \| history
web/MonitorWeb/monitorweb/templates/sitehistory.kid	[new file with mode: 0644]	blob
web/MonitorWeb/monitorweb/templates/sitelist.kid		diff \| blob \| history
web/MonitorWeb/monitorweb/templates/sitemenu.kid		diff \| blob \| history
www/gadgets/sitemonitor.py		diff \| blob \| history
zabbix.spec		diff \| blob \| history
zabbix/zabbixsync.py		diff \| blob \| history

monitor

RSS Atom