src/warden-server/lib/Warden.pm · 6d747ced87a0a30ee2754cfaae74486a2f30d546 · Pavel Valach / Warden

Source project has a limited visibility.

11 years ago

Merge branch 'warden-server-2.2' of homeproj.cesnet.cz:warden · 008ab67b

Jakub Cegan authored 11 years ago

Conflicts:
	packages/build-server.sh
	src/warden-server/bin/wardenWatchdog.pl
	src/warden-server/doc/CHANGELOG
	src/warden-server/doc/README
	src/warden-server/lib/Warden.pm
	src/warden-server/sh/uninstall.sh
	src/warden-server/sh/update.sh

008ab67b

History

Merge branch 'warden-server-2.2' of homeproj.cesnet.cz:warden

Jakub Cegan authored 11 years ago

Conflicts:
	packages/build-server.sh
	src/warden-server/bin/wardenWatchdog.pl
	src/warden-server/doc/CHANGELOG
	src/warden-server/doc/README
	src/warden-server/lib/Warden.pm
	src/warden-server/sh/uninstall.sh
	src/warden-server/sh/update.sh