Ruben S. Montero 3ab03c4268 Merge branch 'feature-457' ...

Conflicts:
	src/nebula/SConstruct
	src/scheduler/SConstruct
	src/scheduler/src/pool/test/SConstruct
	src/scheduler/src/sched/SConstruct
	src/scheduler/src/xml/test/SConstruct

2011-01-28 17:01:28 +01:00

..

init.d

bug #394: changed CentOS init script to rely on /usr/bin/one instead of starting oned and scheduler separately

2010-11-24 12:58:45 +01:00

defaultrc

Changed copyright notice

2010-02-22 18:00:30 +01:00

oned.conf

Merge branch 'feature-457'

2011-01-28 17:01:28 +01:00