Commit 2af7203f authored by Giuseppe Lo Presti's avatar Giuseppe Lo Presti
Browse files

Merge remote-tracking branch 'origin/v2_1_14Version'

Conflicts:
	castor/db/oracleGC.sql
	debian/control
parents 1ba5e3fd e076f114
......@@ -34,7 +34,7 @@ BEGIN
FROM DrainingJob WHERE status = dconst.DRAININGJOB_RUNNING) LOOP
DECLARE
CONSTRAINT_VIOLATED EXCEPTION;
PRAGMA EXCEPTION_INIT(CONSTRAINT_VIOLATED, -1);
PRAGMA EXCEPTION_INIT(CONSTRAINT_VIOLATED, -2292);
BEGIN
BEGIN
-- lock the draining job first
......
......@@ -62,7 +62,7 @@ Description: castor (Cern Advanced STORage system)
Package: castor-transfer-manager
Architecture: any
Depends: python, logrotate, cx_Oracle >= 5.1.1, python-daemon, python-rpyc >= 3.3, castor-lib = %{version}-%{release}, castor-lib-server = %{version}-%{release}
Depends: python, logrotate, cx_Oracle >= 5.1.1, python-daemon, python-rpyc >= 3.3, castor-lib = %{version}-%{release}, castor-dbtools = %{version}-%{release}, castor-lib-server = %{version}-%{release}
Description: castor (Cern Advanced STORage system)
Transfer manager daemon for Castor, central server package
XBS-Obsoletes: castor-rmmaster-server
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment