[midPoint-git] midPoint branch master updated. v2.3devel-154-gc189bc6

[Pavol Mederly]

Project "midPoint" branch master has been updated
       via  c189bc619ad45fc513021dc07cf822e9e1de02d1 (commit) v2.3devel-154-gc189bc6
       via  13fdf0893560f86d3546a069dbafefb06d1ddf42 (commit) v2.3devel-153-g13fdf08
       via  927863440d2ff3754ed6c0aa436f0d9c5931e212 (commit) v2.3devel-151-g9278634
       via  c142e61011b0c4d8cb3b9360e2eaf23e15caf4e6 (commit) v2.3devel-150-gc142e61
       via  2b104af1464d5cd8a57165f540825ed0cbe54e84 (commit) v2.3devel-146-g2b104af
      from  12f24f58d993887376418fd7cbe4564a4ee54045 (commit) v2.3devel-149-g12f24f5

- Log -----------------------------------------------------------------
commit c189bc619ad45fc513021dc07cf822e9e1de02d1
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Oct 28 21:44:35 2013 +0100

    Fix for MID-1638.

commit 13fdf0893560f86d3546a069dbafefb06d1ddf42
Merge: 9278634 12f24f5
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Oct 28 21:03:21 2013 +0100

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

commit 927863440d2ff3754ed6c0aa436f0d9c5931e212
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Oct 28 21:02:46 2013 +0100

    Partial fix for MID-1643 (checking connector configuration properties on resource import).

commit c142e61011b0c4d8cb3b9360e2eaf23e15caf4e6
Merge: 2b104af 8291788
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Oct 28 20:08:20 2013 +0100

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

commit 2b104af1464d5cd8a57165f540825ed0cbe54e84
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Oct 28 20:08:06 2013 +0100

    Fix for MID-1643.

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

(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:
 .../web/page/admin/resources/PageResource.java     |   31 ++++++++++++++++----
 .../admin/resources/dto/ResourceDtoProvider.java   |   15 ++++++++--
 .../midpoint/model/importer/ObjectImporter.java    |    9 ++++++
 3 files changed, 46 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
midPoint