[midPoint-svn] midPoint branch master updated. midpoint-2.2rc2-46-gcbbb773

[Erik Suta]

Project "midPoint" branch master has been updated
       via  cbbb773fcc15c455ff2e707474525cd6245096c0 (commit) midpoint-2.2rc2-46-gcbbb773
       via  e1d853bcea28ec085a2aee1e0fb99c94576efa35 (commit) midpoint-2.2rc2-43-ge1d853b
       via  7cc73092aa3780f00948b9e5a1d19058576a7bae (commit) midpoint-2.2rc2-26-g7cc7309
      from  5eb26af68f1663c9f72877667556b6e8c855b5fe (commit) midpoint-2.2rc2-43-g5eb26af

- Log -----------------------------------------------------------------
commit cbbb773fcc15c455ff2e707474525cd6245096c0
Merge: e1d853b 5eb26af
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Wed Aug 21 12:06:15 2013 +0200

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

commit e1d853bcea28ec085a2aee1e0fb99c94576efa35
Merge: f025d48 7cc7309
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Wed Aug 21 11:49:44 2013 +0200

    Merge branch 'prof1'

commit 7cc73092aa3780f00948b9e5a1d19058576a7bae
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Wed Aug 21 11:48:59 2013 +0200

    First iteration of profiling integration:
    - request servlet filter implementation
    - common-2a schema alteration

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

(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/util/MidPointProfilingServletFilter.java   |   50 ++++++++++++++++++--
 gui/admin-gui/src/main/resources/logback.xml       |   24 ++++++++++
 gui/admin-gui/src/main/resources/objects.xml       |   10 ++++
 .../resources/xml/ns/public/common/common-2a.xsd   |   25 ++++++++++
 4 files changed, 106 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
midPoint