[midPoint-git] [Evolveum/midpoint] 5f4f76: Changing ConnId version

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5f4f76c2fef18c961858382d5fe76a09db8eccfa
      https://github.com/Evolveum/midpoint/commit/5f4f76c2fef18c961858382d5fe76a09db8eccfa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Changing ConnId version


  Commit: b7470a2e6f912a6ac29a051825aefcdf8a1cb8c0
      https://github.com/Evolveum/midpoint/commit/b7470a2e6f912a6ac29a051825aefcdf8a1cb8c0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestObjTemplateLiveSyncTask.java
    A model/model-intest/src/test/resources/sync/resource-dummy-byzantine.xml
    A model/model-intest/src/test/resources/sync/system-configuration-byzantine.xml
    A model/model-intest/src/test/resources/sync/task-dummy-byzantine-livesync.xml
    A model/model-intest/src/test/resources/sync/task-dummy-byzantine-recon.xml
    A model/model-intest/src/test/resources/sync/user-template-byzantine.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    A testing/longtest/src/test/resources/ldap-complex/org.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/b4e8ef4bc31c...b7470a2e6f91