[midPoint-git] [Evolveum/midpoint] 29dc9c: Allowing multiple intents in an association defini...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 29dc9cd6bd1262c98a30ed341e5f9807d52a0a59
      https://github.com/Evolveum/midpoint/commit/29dc9cd6bd1262c98a30ed341e5f9807d52a0a59
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java

  Log Message:
  -----------
  Allowing multiple intents in an association definition (fixes MID-1960).


  Commit: 37f940b0662ae4ecf9cd4425268786d92001a9ce
      https://github.com/Evolveum/midpoint/commit/37f940b0662ae4ecf9cd4425268786d92001a9ce
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html

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


Compare: https://github.com/Evolveum/midpoint/compare/350d17555ad2...37f940b0662a