d1cb68aMerge remote-tracking branch 'origin/master' into ff-finalize-build-cache-configuration
Conflicts: subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CachedTaskExecutionErrorHandlingIntegrationTest.groovy subprojects/core/src/main/java/org/gradle/caching/internal/BuildCacheServiceProvider.java subprojects/core/src/test/groovy/org/gradle/caching/internal/AbstractRoleAwareBuildCacheServiceDecoratorTest.groovy |
![]() |