[midPoint-git] [Evolveum/midpoint] b51632: Helper methods to deal with "aggregated" rules/tri...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: b51632b4620004bb689c1496b03591864845b30a
      https://github.com/Evolveum/midpoint/commit/b51632b4620004bb689c1496b03591864845b30a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  Helper methods to deal with "aggregated" rules/triggers in policy situation rules triggers.


  Commit: 057ec9e25924f438930d522fbe5047e86f92e6dc
      https://github.com/Evolveum/midpoint/commit/057ec9e25924f438930d522fbe5047e86f92e6dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties

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


Compare: https://github.com/Evolveum/midpoint/compare/6126b4c5c96e...057ec9e25924