[midPoint-git] [Evolveum/midpoint] 6d0961: fixing problem with importing object with password...

[katkav]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6d0961840602207b31f71713f78d45df4bdbff0a
      https://github.com/Evolveum/midpoint/commit/6d0961840602207b31f71713f78d45df4bdbff0a
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/BaseProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/util/XNodeProcessorUtil.java

  Log Message:
  -----------
  fixing problem with importing object with passwords..


  Commit: 699290e83940809346d4192bfdcd80fb08f42907
      https://github.com/Evolveum/midpoint/commit/699290e83940809346d4192bfdcd80fb08f42907
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/f735b1f71858...699290e83940