[midPoint-git] [Evolveum/midpoint] 622b75: Exploring inbound from multiple projections (MID-2...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 622b75b88856a1fc113fafb9e4b55c392ea4f598
      https://github.com/Evolveum/midpoint/commit/622b75b88856a1fc113fafb9e4b55c392ea4f598
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
    M model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml

  Log Message:
  -----------
  Exploring inbound from multiple projections (MID-2532), but not fixing it.


  Commit: 54d337db53a0d67da46928fc08573a7218487417
      https://github.com/Evolveum/midpoint/commit/54d337db53a0d67da46928fc08573a7218487417
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java

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


Compare: https://github.com/Evolveum/midpoint/compare/9f28de9be286...54d337db53a0