[midPoint-git] [Evolveum/midpoint] 4edbd1: fixing 500 error while sorting properties on the o...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4edbd1e91f5ff597eee5eaa19343e09a4eef9d26
      https://github.com/Evolveum/midpoint/commit/4edbd1e91f5ff597eee5eaa19343e09a4eef9d26
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java

  Log Message:
  -----------
  fixing 500 error while sorting properties on the object edit page


  Commit: f69448c5263691a83d67c58a5af1c563cb8e0c3e
      https://github.com/Evolveum/midpoint/commit/f69448c5263691a83d67c58a5af1c563cb8e0c3e
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java

  Log Message:
  -----------
  removed duplicated code


  Commit: 8f00583842e636262068e661060ab9e137f9da34
      https://github.com/Evolveum/midpoint/commit/8f00583842e636262068e661060ab9e137f9da34
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/Lsof.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java

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


Compare: https://github.com/Evolveum/midpoint/compare/ef9daccf0abb...8f00583842e6