[midPoint-git] [Evolveum/midpoint] 7f2981: fixing compilatiom failure

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7f29812f45905063c8ae5f10ee0f6afea2599998
      https://github.com/Evolveum/midpoint/commit/7f29812f45905063c8ae5f10ee0f6afea2599998
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

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

  Log Message:
  -----------
  fixing compilatiom failure


  Commit: 189d966e0fa1a93c16022bda2795eb9b6e9b62c8
      https://github.com/Evolveum/midpoint/commit/189d966e0fa1a93c16022bda2795eb9b6e9b62c8
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/resources/logback-test.xml
    M testing/story/src/test/resources/unix/role-unix.xml
    A testing/story/src/test/resources/unix/sequence-uidnumber.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/4f4ee61badf0...189d966e0fa1