[midPoint-git] midPoint branch bootstrap updated. v2.2-141-g48f3574

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  48f3574dd9ca304420107b13040d637bf20d0f49 (commit) v2.2-141-g48f3574
       via  e13ec9e89c44addd03f01db0385288b0d556d707 (commit) v2.2-93-ge13ec9e
       via  a100161b89da50a9cd6bb63c76d3456709052245 (commit) v2.2-92-ga100161
      from  fe2b41706b0121953cd1091c680c36a1d3226a6b (commit) v2.2-138-gfe2b417

- Log -----------------------------------------------------------------
commit 48f3574dd9ca304420107b13040d637bf20d0f49
Merge: fe2b417 e13ec9e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 8 12:12:50 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:
 .../resources/content/PageContentAccounts.java     |    5 +-
 .../util/aspect/MethodUsageStatistics.java         |   42 +++++++-----
 .../midpoint/util/aspect/MidpointAspect.java       |    4 +-
 .../midpoint/util/aspect/ProfilingDataLog.java     |    4 +-
 .../midpoint/util/aspect/ProfilingDataManager.java |   69 ++++++++++++++------
 .../com/evolveum/midpoint/util/ProfilingTest.java  |   14 ++--
 infra/util/testng.xml                              |    5 ++
 7 files changed, 97 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
midPoint