[midPoint-git] [Evolveum/midpoint] 386455: Revisiting MID-3348 once again: Removed temporary ...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 386455e6b3da66e3ec2beba09d5706fcc56c4a36
      https://github.com/Evolveum/midpoint/commit/386455e6b3da66e3ec2beba09d5706fcc56c4a36
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M model/model-intest/src/test/resources/activation/resource-dummy-coral.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    M samples/resources/googleapps/googleapps-resource.xml

  Log Message:
  -----------
  Revisiting MID-3348 once again: Removed temporary solution of attributeType for simulated activation status


  Commit: 166e7aa3f664933fea785c553a38801dd5b737c3
      https://github.com/Evolveum/midpoint/commit/166e7aa3f664933fea785c553a38801dd5b737c3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M .gitignore
    M build-system/pom.xml
    M gui/admin-gui/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/37a7be917068...166e7aa3f664