[midPoint-git] midPoint branch master updated. v2.3devel-310-g1b25651

[Pavol Mederly]

Project "midPoint" branch master has been updated
       via  1b2565196d2900ae9674272e25088f6411235116 (commit) v2.3devel-310-g1b25651
       via  45f0f345e5e7c216c1205ce9e99e81edc23b5d82 (commit) v2.3devel-309-g45f0f34
      from  b48a8fe119445e5684125c2c8731f638250775ba (commit) v2.3devel-308-gb48a8fe

- Log -----------------------------------------------------------------
commit 1b2565196d2900ae9674272e25088f6411235116
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Wed Dec 4 19:45:09 2013 +0100

    Fixes for MID-1702 and MID-1683.

commit 45f0f345e5e7c216c1205ce9e99e81edc23b5d82
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Wed Dec 4 18:27:14 2013 +0100

    Fixed display name for ValidityStatus.

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../admin/server/PageTasks_en_US.utf8.properties   |    5 ++-
 .../admin/server/PageTasks_sk_SK.utf8.properties   |    5 ++-
 .../midpoint/web/page/admin/server/PageTasks.java  |   11 ++++--
 .../web/page/admin/server/PageTasks.properties     |    3 ++
 .../resources/xml/ns/public/common/common-2a.xsd   |    2 +-
 .../evolveum/midpoint/task/api/TaskManager.java    |    6 +--
 .../task/quartzimpl/TaskManagerQuartzImpl.java     |   19 +++++++--
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |    6 ++-
 .../quartzimpl/execution/ExecutionManager.java     |   41 +++++++++++++++++++-
 .../task/quartzimpl/execution/JobExecutor.java     |    4 +-
 .../quartzimpl/TestQuartzTaskManagerContract.java  |   12 +++---
 11 files changed, 92 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
midPoint