scientific.zcu.cz Git - jra1mw.git/commit

git://scientific.zcu.cz / jra1mw.git / commit

author	Aleš Křenek <ljocha@ics.muni.cz>
	Thu, 21 Dec 2006 11:12:34 +0000 (11:12 +0000)
committer	Aleš Křenek <ljocha@ics.muni.cz>
	Thu, 21 Dec 2006 11:12:34 +0000 (11:12 +0000)
commit	2b62f8cd0d1ee2de8952e57dbaba4409ba99474c
tree	0421c0d9facd2cb569cd485fee7d55a94d0e07d8	tree \| snapshot
parent	c3acd95e56612486ed95216f7b6447aa2a1ad5de	commit \| diff

merge _generic branch, resolve conflicts

61 files changed:

org.glite.lb.server/Makefile		diff \| blob \| blame \| history
org.glite.lb.server/examples/ws_joblog.c		diff \| blob \| blame \| history
org.glite.lb.server/examples/ws_jobstat.c		diff \| blob \| blame \| history
org.glite.lb.server/examples/ws_query_ex.c		diff \| blob \| blame \| history
org.glite.lb.server/interface/job-attrs.xsd		diff \| blob \| blame \| history
org.glite.lb.server/interface/job-record.xsd		diff \| blob \| blame \| history
org.glite.lb.server/interface/lb_authz.h		diff \| blob \| blame \| history
org.glite.lb.server/interface/store.h		diff \| blob \| blame \| history
org.glite.lb.server/src/bkindex.c		diff \| blob \| blame \| history
org.glite.lb.server/src/bkserverd.c		diff \| blob \| blame \| history
org.glite.lb.server/src/db_store.c		diff \| blob \| blame \| history
org.glite.lb.server/src/db_supp.c	[new file with mode: 0644]	blob
org.glite.lb.server/src/db_supp.h	[new file with mode: 0644]	blob
org.glite.lb.server/src/dump.c		diff \| blob \| blame \| history
org.glite.lb.server/src/get_events.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/get_events.h		diff \| blob \| blame \| history
org.glite.lb.server/src/il_lbproxy.c		diff \| blob \| blame \| history
org.glite.lb.server/src/il_lbproxy.h		diff \| blob \| blame \| history
org.glite.lb.server/src/il_notification.c		diff \| blob \| blame \| history
org.glite.lb.server/src/index.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/index_parse.y		diff \| blob \| blame \| history
org.glite.lb.server/src/job-attrs-common.xsd.T	[new file with mode: 0644]	blob
org.glite.lb.server/src/job-attrs-native.xsd.T	[new file with mode: 0644]	blob
org.glite.lb.server/src/jobstat-generic.c	[new file with mode: 0644]	blob
org.glite.lb.server/src/jobstat.c		diff \| blob \| blame \| history
org.glite.lb.server/src/jobstat.h		diff \| blob \| blame \| history
org.glite.lb.server/src/jobstat_supp.c		diff \| blob \| blame \| history
org.glite.lb.server/src/jp_job_attrs.xsl		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_authz.c		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_html.c		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_html.h		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_plugin.c.T	[new file with mode: 0644]	blob
org.glite.lb.server/src/lb_proto.c		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_xml_parse.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_xml_parse.h		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_xml_parse_V21.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/lb_xml_parse_V21.h		diff \| blob \| blame \| history
org.glite.lb.server/src/lbs_db.c		diff \| blob \| blame \| history
org.glite.lb.server/src/load.c		diff \| blob \| blame \| history
org.glite.lb.server/src/lock.c		diff \| blob \| blame \| history
org.glite.lb.server/src/lock.h		diff \| blob \| blame \| history
org.glite.lb.server/src/notif_match.c		diff \| blob \| blame \| history
org.glite.lb.server/src/notification.c		diff \| blob \| blame \| history
org.glite.lb.server/src/process_event.c		diff \| blob \| blame \| history
org.glite.lb.server/src/purge.h		diff \| blob \| blame \| history
org.glite.lb.server/src/query.c		diff \| blob \| blame \| history
org.glite.lb.server/src/query.h		diff \| blob \| blame \| history
org.glite.lb.server/src/request.c		diff \| blob \| blame \| history
org.glite.lb.server/src/seqcode.c		diff \| blob \| blame \| history
org.glite.lb.server/src/server_state.c		diff \| blob \| blame \| history
org.glite.lb.server/src/srv-context.h	[new file with mode: 0644]	blob
org.glite.lb.server/src/srv_purge.c		diff \| blob \| blame \| history
org.glite.lb.server/src/stats.c		diff \| blob \| blame \| history
org.glite.lb.server/src/store.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/userjobs.c		diff \| blob \| blame \| history
org.glite.lb.server/src/write2rgma.c		diff \| blob \| blame \| history
org.glite.lb.server/src/ws_query.c		diff \| blob \| blame \| history
org.glite.lb.server/src/ws_typeref.c.T		diff \| blob \| blame \| history
org.glite.lb.server/src/ws_typeref.h		diff \| blob \| blame \| history
org.glite.lb.server/test/test_query_events.cpp		diff \| blob \| blame \| history
org.glite.lb.server/test/test_xml.cpp.T		diff \| blob \| blame \| history

jra1mw project from LCG CVS.

RSS Atom