[midPoint-git] midPoint branch bootstrap updated. v2.2-202-g615471e

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  615471e38514f03af15fc9b3f03f541012fc1642 (commit) v2.2-202-g615471e
       via  d6c816d90c9de1fd90872514fda995a4e0c679a8 (commit) v2.2-116-gd6c816d
       via  0d2a1390074216a0cfb7dd71ed84b08a2f40bf0c (commit) v2.2-115-g0d2a139
       via  7026243a7d872ea4dac4164e91fa81a884f85ae5 (commit) v2.2-114-g7026243
       via  2f64a8f350c59d668ecd5f007583732f27807365 (commit) v2.2-113-g2f64a8f
      from  b5df62f277f4611c195a9d9a40aabe7af972bebd (commit) v2.2-197-gb5df62f

- Log -----------------------------------------------------------------
commit 615471e38514f03af15fc9b3f03f541012fc1642
Merge: b5df62f d6c816d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 15 14:15:20 2013 +0200

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap

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

(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:
 .../script/ScriptExpressionEvaluatorFactory.java   |    2 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |   25 +++-
 .../provisioning/impl/ResourceObjectConverter.java |   17 +++
 .../midpoint/provisioning/impl/ShadowCache.java    |   51 +-------
 .../midpoint/provisioning/impl/ShadowManager.java  |  133 ++++++++++++++++----
 .../provisioning/test/impl/TestOpenDJ.java         |    4 +-
 .../testing/consistency/ConsistencyTest.java       |   18 +--
 7 files changed, 170 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
midPoint