From: Aleš Křenek Date: Wed, 15 Mar 2006 17:41:09 +0000 (+0000) Subject: 1.5 merge X-Git-Tag: merge_for_3_1_after~9 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c8804936c88e0f2531295fd1589e43aa0362d0d0;p=jra1mw.git 1.5 merge --- diff --git a/org.glite.lb.client-interface/interface/context.h b/org.glite.lb.client-interface/interface/context.h index b1e366a..3fed100 100644 --- a/org.glite.lb.client-interface/interface/context.h +++ b/org.glite.lb.client-interface/interface/context.h @@ -180,7 +180,7 @@ typedef enum _edg_wll_ErrorCode { EDG_WLL_ERROR_DNS, /**< DNS resolver error. See errDesc returned by edg_wll_Error(). */ EDG_WLL_ERROR_NOJOBID, /**< Attmepted call requires calling edg_wll_SetLoggingJob() first. */ EDG_WLL_ERROR_NOINDEX, /**< Query does not contain any conidion on indexed attribute. */ - EDG_WLL_IL_PROTO, /**< Interlogger to lbserver communication protocol error. */ + EDG_WLL_IL_PROTO, /**< Lbserver (proxy) store communication protocol error. */ EDG_WLL_IL_SYS, /**< Interlogger internal error. */ EDG_WLL_IL_EVENTS_WAITING, /**< Interlogger still has events pending delivery. */ EDG_WLL_ERROR_COMPARE_EVENTS, /**< Two compared events differ. */ diff --git a/org.glite.lb.client-interface/project/build.number b/org.glite.lb.client-interface/project/build.number index 4ab76be..4359cf0 100644 --- a/org.glite.lb.client-interface/project/build.number +++ b/org.glite.lb.client-interface/project/build.number @@ -1,2 +1,2 @@ -#Sat Oct 15 06:32:19 CEST 2005 -module.build=154 +#Wed Mar 15 04:41:31 CET 2006 +module.build=0234 diff --git a/org.glite.lb.client-interface/project/version.properties b/org.glite.lb.client-interface/project/version.properties index 30d6c44..1b667cb 100644 --- a/org.glite.lb.client-interface/project/version.properties +++ b/org.glite.lb.client-interface/project/version.properties @@ -1,6 +1,4 @@ #Fri Sep 02 14:16:31 CEST 2005 -module.version=3.0.0 # glite-lb-client-interface_branch_3_0_0_RC15 tag is taken! - -module.build=2 -module.age=1 +module.version=2.1.2 +module.age=0