[midPoint-git] [Evolveum/midpoint] 644547: Add 'assign role' notification test

Viliam Repan vilo.repan at evolveum.com
Thu Apr 12 12:27:54 CEST 2018 

  Branch: refs/heads/feature/auth-caching
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6445476654c70ce35b5e22e87ae5aa37c2f4c353
      https://github.com/Evolveum/midpoint/commit/6445476654c70ce35b5e22e87ae5aa37c2f4c353
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java

  Log Message:
  -----------
  Add 'assign role' notification test

The idea is to catch "Target: approvalroletest1 (dummy) [owner]"
style texts but unfortunately they do not occur in usual cases.


  Commit: 495777367bf330ab89803ddfc53fff2f956df097
      https://github.com/Evolveum/midpoint/commit/495777367bf330ab89803ddfc53fff2f956df097
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


  Commit: f4145afeb8c3db7f55a4984ce08a85aacd05f9ac
      https://github.com/Evolveum/midpoint/commit/f4145afeb8c3db7f55a4984ce08a85aacd05f9ac
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  fixing TestUnix


  Commit: 817e6231df23b080d43d8344ad5bbd3116bc283d
      https://github.com/Evolveum/midpoint/commit/817e6231df23b080d43d8344ad5bbd3116bc283d
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java

  Log Message:
  -----------
  MID-4471 delete assignment button authorization


  Commit: bb598267078e984f72a650c70768a98db3733d49
      https://github.com/Evolveum/midpoint/commit/bb598267078e984f72a650c70768a98db3733d49
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml

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


  Commit: 0c352838c3a738e8ca3d3be2efc27678a7d6bbf7
      https://github.com/Evolveum/midpoint/commit/0c352838c3a738e8ca3d3be2efc27678a7d6bbf7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java

  Log Message:
  -----------
  fixing TestRetirement


  Commit: 8831df4273daab2654de712313551f987fe0a977
      https://github.com/Evolveum/midpoint/commit/8831df4273daab2654de712313551f987fe0a977
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java

  Log Message:
  -----------
  fixing TestTrafo


  Commit: 0a3b3d95f1458ba71b468267237286631ac9864f
      https://github.com/Evolveum/midpoint/commit/0a3b3d95f1458ba71b468267237286631ac9864f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java

  Log Message:
  -----------
  fixing TestMachineIntelligence


  Commit: 18cebeac4f3df3149d78e0104b5d37574b141c88
      https://github.com/Evolveum/midpoint/commit/18cebeac4f3df3149d78e0104b5d37574b141c88
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json

  Log Message:
  -----------
  Missing JSON files for REST tests


  Commit: cda6af506465c7a221fc755620361056d0388ee3
      https://github.com/Evolveum/midpoint/commit/cda6af506465c7a221fc755620361056d0388ee3
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json

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


  Commit: cd3cbcb613ea7b1836b77954d72a40fc4effa5f8
      https://github.com/Evolveum/midpoint/commit/cd3cbcb613ea7b1836b77954d72a40fc4effa5f8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java

  Log Message:
  -----------
  Use 'distinct' when displaying objects (MID-3955)

The GUI uses 'distinct' search option when displaying objects, unless
disabled in the system configuration.

Important change in repo: query interpreter now optimizes usage of
'distinct'. If there are no joins, distinct is not applied even if
requested. This heuristic would need to be changed if it would be
found to be ineffective (see e.g.
QueryInterpreter2Test.test0350QuerySubtreeDistinctCount).


  Commit: a029c5c318c87fe08eb3c1df3cc40afd293aa135
      https://github.com/Evolveum/midpoint/commit/a029c5c318c87fe08eb3c1df3cc40afd293aa135
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestReconNullValue.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    A testing/story/src/test/resources/recon-null-value/object-template-user.xml
    A testing/story/src/test/resources/recon-null-value/org-top.xml
    A testing/story/src/test/resources/recon-null-value/resource-opendj.xml
    A testing/story/src/test/resources/recon-null-value/role-ldap.xml
    M testing/story/testng-integration.xml

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


  Commit: f2117751cd1669a6ff113adb6ad2e7ee51cc87db
      https://github.com/Evolveum/midpoint/commit/f2117751cd1669a6ff113adb6ad2e7ee51cc87db
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java

  Log Message:
  -----------
  Add button fix on the construction details panel


  Commit: 79acd3179677839da4657a8efea300631e5933ed
      https://github.com/Evolveum/midpoint/commit/79acd3179677839da4657a8efea300631e5933ed
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java

  Log Message:
  -----------
  CSV connector switched to version 2.2


  Commit: f60c3a1bc6e942a29bc754f564fdb05a4cbe50d5
      https://github.com/Evolveum/midpoint/commit/f60c3a1bc6e942a29bc754f564fdb05a4cbe50d5
  Author: kate <honchar at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

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


  Commit: 8631eb05b9fa43ec1f9a6e44c291ccd6e3b0111c
      https://github.com/Evolveum/midpoint/commit/8631eb05b9fa43ec1f9a6e44c291ccd6e3b0111c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  clone fix in repo cache


  Commit: dd921f24a3e22a5cdadba5d971e91fa2d976b85a
      https://github.com/Evolveum/midpoint/commit/dd921f24a3e22a5cdadba5d971e91fa2d976b85a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java

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


  Commit: bfcc7a29f0ba93de62839822475776f691a51c27
      https://github.com/Evolveum/midpoint/commit/bfcc7a29f0ba93de62839822475776f691a51c27
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java

  Log Message:
  -----------
  Change work allocation contention resolution

>From linear to truncated exponential backoff. It should now scale
better for many worker threads. Changed task manager configuration
fields (renamed: workAllocationMaxRetries,
new: workAllocationRetryExponentialThreshold). Unified backoff
algorithm with the one used in repository service.

Also fixed the problem of hanging of tasks hit by allocation failures.


  Commit: f55e07d65ec83a93ae301653aabc775d7383d92d
      https://github.com/Evolveum/midpoint/commit/f55e07d65ec83a93ae301653aabc775d7383d92d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

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


  Commit: 4e98efff36d81e5abdf078b0b7fddf0625994a35
      https://github.com/Evolveum/midpoint/commit/4e98efff36d81e5abdf078b0b7fddf0625994a35
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/FailableRunnable.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/BackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/ExponentialBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/LinearBackoffComputer.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/backoff/RetryLimitedBackoffComputer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/csv/AbstractCsvTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/HibernateQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/RootHibernateQuery.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/work/WorkStateManager.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-replace-answer-id-1-value.json
    M testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-no-answer.json
    A testing/rest/src/test/resources/req/json/modification-replace-two-answers.json
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/auth-caching

# Conflicts:
#	repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java


  Commit: 61c13393656fa9fdd92a0110e31cd8f5c63b377e
      https://github.com/Evolveum/midpoint/commit/61c13393656fa9fdd92a0110e31cd8f5c63b377e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/auth-caching

# Conflicts:
#	repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java


Compare: https://github.com/Evolveum/midpoint/compare/bec2460b1291...61c13393656f

More information about the midPoint-svn mailing list