[midPoint-git] [Evolveum/midpoint] f93b1f: MID-2711 second attempt to fix

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f93b1f36a4b3b67d35743dfee63fb2cf74d09532
      https://github.com/Evolveum/midpoint/commit/f93b1f36a4b3b67d35743dfee63fb2cf74d09532
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java

  Log Message:
  -----------
  MID-2711 second attempt to fix


  Commit: e1b30c889dd9a99c4ac955dfc87f1f9bce1cb585
      https://github.com/Evolveum/midpoint/commit/e1b30c889dd9a99c4ac955dfc87f1f9bce1cb585
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/CompositeDataSource.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/26bd286a49ff...e1b30c889dd9