From 61be9914f30b208ebfd8eb8032239b01a3a74e56 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 15 Mar 2006 17:33:24 +0000 Subject: [PATCH] merge of 1.5 branch --- org.glite.lb/build.xml | 34 ++++++++++++++++++++++++++-- org.glite.lb/project/build.number | 4 ++-- org.glite.lb/project/dependencies.properties | 2 +- org.glite.lb/project/glite.lb.csf.xml | 15 ++++++++++++ org.glite.lb/project/version.properties | 3 +-- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml index a1b993d..d0f4b29 100755 --- a/org.glite.lb/build.xml +++ b/org.glite.lb/build.xml @@ -20,6 +20,36 @@ Revision history: $Log$ + Revision 1.39 2005/11/27 21:51:18 eronchie + Applied fix for bug 13928 + + Revision 1.38 2005/11/22 12:13:47 eronchie + Removed one utils + + Revision 1.37 2005/11/04 14:39:20 akrenek + merge in the "lbonly" hack + + Revision 1.36.4.6 2006/02/06 12:10:00 akrenek + make proxy depend on logger explicitely + + Revision 1.36.4.5 2005/12/02 11:15:33 akrenek + resolved logger dependency conflict + + Revision 1.36.4.4 2005/12/02 10:04:14 jpospi + server depends on logger + + Revision 1.36.4.3 2005/11/28 10:39:08 akrenek + merge bug #13928 fix on the pre_cares branch + + Revision 1.36.4.2 2005/11/24 12:59:36 akrenek + server depends on bones + + Revision 1.36.4.1 2005/11/24 12:32:02 akrenek + merged in "lbonly" + + Revision 1.39 2005/11/27 21:51:18 eronchie + Applied fix for bug 13928 + Revision 1.38 2005/11/22 12:13:47 eronchie Removed one utils @@ -471,7 +501,7 @@ - + @@ -487,7 +517,7 @@ - + diff --git a/org.glite.lb/project/build.number b/org.glite.lb/project/build.number index 7e1b0d4..6a3103f 100644 --- a/org.glite.lb/project/build.number +++ b/org.glite.lb/project/build.number @@ -1,2 +1,2 @@ -#Fri Oct 14 12:41:13 CEST 2005 -module.build=153 +#Wed Mar 15 05:08:54 CET 2006 +module.build=0232 diff --git a/org.glite.lb/project/dependencies.properties b/org.glite.lb/project/dependencies.properties index a8047f7..710fb40 100644 --- a/org.glite.lb/project/dependencies.properties +++ b/org.glite.lb/project/dependencies.properties @@ -17,4 +17,4 @@ org.glite.lb.server-bones.version = HEAD org.glite.lb.logger.version = HEAD org.glite.lb.utils.version = HEAD -ext.gsoap.version=2.7.0 +ext.gsoap.version = 2.7.0 diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml index 2b43a01..5d14147 100644 --- a/org.glite.lb/project/glite.lb.csf.xml +++ b/org.glite.lb/project/glite.lb.csf.xml @@ -22,6 +22,21 @@ Revision history: $Log$ + Revision 1.15 2005/11/27 21:51:18 eronchie + Applied fix for bug 13928 + + Revision 1.14 2005/10/15 20:14:55 jpospi + remove duplicate lb.utils section + + Revision 1.13.2.1.2.1 2005/11/28 10:39:08 akrenek + merge bug #13928 fix on the pre_cares branch + + Revision 1.13.2.1 2005/10/17 16:27:48 akrenek + merged in the duplicate utils targed patch + + Revision 1.15 2005/11/27 21:51:18 eronchie + Applied fix for bug 13928 + Revision 1.14 2005/10/15 20:14:55 jpospi remove duplicate lb.utils section diff --git a/org.glite.lb/project/version.properties b/org.glite.lb/project/version.properties index af4c5e4..b79d21d 100644 --- a/org.glite.lb/project/version.properties +++ b/org.glite.lb/project/version.properties @@ -1,4 +1,3 @@ #Fri Sep 02 14:19:10 CEST 2005 module.version=1.3.0 -module.build=3 -module.age=1 +module.age=0 -- 1.8.2.3