From d72375eb697c7ae2e0d14226d874e61d5401909d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 15 Apr 2010 16:30:36 +0000 Subject: [PATCH] Merge from branch_4006. --- org.glite.lb.logger/project/version.properties | 4 ++-- org.glite.lb.server/project/ChangeLog | 3 +++ org.glite.lb.server/project/version.properties | 4 ++-- org.glite.lb.server/src/jobstat.c | 5 ++++- org.glite.lb/project/version.properties | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties index f217dfa..a83fffc 100644 --- a/org.glite.lb.logger/project/version.properties +++ b/org.glite.lb.logger/project/version.properties @@ -1,3 +1,3 @@ # $Header$ -module.version=2.0.4 -module.age=2 +module.version=2.0.5 +module.age=1 diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog index 62b4165..75738db 100644 --- a/org.glite.lb.server/project/ChangeLog +++ b/org.glite.lb.server/project/ChangeLog @@ -93,6 +93,9 @@ 2.0.3-2 - Rebuild with lb.state-machine 1.0.2-1 +2.0.6-1 +- Fixed collection state with cancelled subjobs + --- Crystal ball: 2.0.4-1 diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties index 69f2f17..5b1ea84 100644 --- a/org.glite.lb.server/project/version.properties +++ b/org.glite.lb.server/project/version.properties @@ -1,3 +1,3 @@ # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $ -module.version=2.0.3 -module.age=3 +module.version=2.0.6 +module.age=1 diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index 47291d8..7a518f9 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ - +#ident "$Header$" #include #include @@ -1061,6 +1061,9 @@ static subjobClassCodes class(edg_wll_JobStat *stat) // failed & cancelled return(SUBJOB_CLASS_REST); break; + case EDG_WLL_JOB_CANCELLED: + return(SUBJOB_CLASS_CLEARED); + break; case EDG_WLL_JOB_ABORTED: return(SUBJOB_CLASS_ABORTED); break; diff --git a/org.glite.lb/project/version.properties b/org.glite.lb/project/version.properties index 9f3167f..b120f71 100644 --- a/org.glite.lb/project/version.properties +++ b/org.glite.lb/project/version.properties @@ -1,3 +1,3 @@ # : /cvs/glite/org.glite.lb/project/version.properties,v 1.164 2008/01/09 15:35:55 mmulac Exp $ -module.version=2.0.5 -module.age=7 +module.version=2.0.7 +module.age=1 -- 1.8.2.3