See <https://buildhive.cloudbees.com/job/jclouds/job/jclouds/52/>
------------------------------------------
[...truncated 98 lines...]
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/TrafficControllerPoolRecordTypeToString.java
left in tree.
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/RoundRobinPoolRecordTypeToString.java
left in tree.
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/internal/DirectionalPoolRecordTypeToString.java
left in tree.
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/TrafficControllerPoolApi.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalPoolApi.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/features/DirectionalGroupApi.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
left in tree.
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
left in tree.
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
CONFLICT (rename/delete):
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/config/UltraDNSWSHttpApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/config/UltraDNSWSHttpApiModule.java
left in tree.
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/UpdatePoolRecordToXML.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/UpdatePoolRecordToXML.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/UpdateDirectionalDNSGroupToXML.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/UpdateDirectionalDNSGroupToXML.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/DirectionalRecordAndGeoGroupToXML.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/DirectionalRecordAndGeoGroupToXML.java
Auto-merging
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/DirectionalGroupCoordinatesToXML.java
CONFLICT (add/add): Merge conflict in
providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/binders/DirectionalGroupCoordinatesToXML.java
CONFLICT (modify/delete):
providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
deleted in HEAD and modified in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
left in tree.
Auto-merging
providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
CONFLICT (add/add): Merge conflict in
providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
Auto-merging providers/trmk-ecloud/pom.xml
CONFLICT (content): Merge conflict in providers/trmk-ecloud/pom.xml
CONFLICT (rename/delete):
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListGeoServicesResponseTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListGeoServicesResponseTest.java
left in tree.
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListGeoRegionGroupsResponseTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListGeoRegionGroupsResponseTest.java
CONFLICT (rename/delete):
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
left in tree.
CONFLICT (rename/delete):
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
left in tree.
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoServiceResponseTest.java
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetGeoRegionGroupResponseTest.java
CONFLICT (rename/delete):
providers/dynect/src/test/java/org/jclouds/dynect/v3/functions/ExtractLastPathComponentTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/test/java/org/jclouds/dynect/v3/functions/ExtractLastPathComponentTest.java
left in tree.
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiLiveTest.java
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoServiceApiExpectTest.java
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiLiveTest.java
Auto-merging
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/test/java/org/jclouds/dynect/v3/features/GeoRegionGroupApiExpectTest.java
CONFLICT (rename/delete):
providers/dynect/src/main/java/org/jclouds/dynect/v3/functions/ExtractLastPathComponent.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/main/java/org/jclouds/dynect/v3/functions/ExtractLastPathComponent.java
left in tree.
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoServiceApi.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/features/GeoRegionGroupApi.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SSHFPData.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SSHFPData.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SPFData.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/rdata/SPFData.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
CONFLICT (rename/delete):
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java deleted
in HEAD and renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java left in
tree.
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
CONFLICT (add/add): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
Auto-merging
providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java
CONFLICT (content): Merge conflict in
providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTParserModule.java
CONFLICT (rename/delete):
providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/main/java/org/jclouds/dynect/v3/config/DynECTHttpApiModule.java
left in tree.
CONFLICT (rename/delete):
providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/RecordIdBinder.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/RecordIdBinder.java
left in tree.
CONFLICT (rename/delete):
providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
providers/dynect/src/main/java/org/jclouds/dynect/v3/binders/CreateRecordBinder.java
left in tree.
Auto-merging
providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
CONFLICT (add/add): Merge conflict in
providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
Auto-merging providers/aws-s3/pom.xml
CONFLICT (content): Merge conflict in providers/aws-s3/pom.xml
Auto-merging
core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/rest/internal/InvokeMappedHttpMethodTest.java
CONFLICT (rename/delete):
core/src/test/java/org/jclouds/rest/internal/BaseHttpApiMetadataTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
core/src/test/java/org/jclouds/rest/internal/BaseHttpApiMetadataTest.java left
in tree.
CONFLICT (rename/delete):
core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
core/src/test/java/org/jclouds/rest/config/MappedHttpInvocationModuleTest.java
left in tree.
Auto-merging
core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/rest/annotationparsing/ClosableApiTest.java
Auto-merging
core/src/test/java/org/jclouds/reflect/Reflection2CoreJavaClassesTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/reflect/Reflection2CoreJavaClassesTest.java
Auto-merging core/src/test/java/org/jclouds/proxy/ProxyForURITest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/proxy/ProxyForURITest.java
Auto-merging
core/src/test/java/org/jclouds/config/BindApiContextWithWildcardExtendsExplicitAndRawTypeTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/config/BindApiContextWithWildcardExtendsExplicitAndRawTypeTest.java
Auto-merging core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java
Auto-merging core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java
Auto-merging
core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/internal/InvokeSyncToAsyncHttpMethod.java
Auto-merging
core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/internal/DelegatesToPotentiallySyncToAsyncInvocationFunction.java
Auto-merging
core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
CONFLICT (rename/delete):
core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java deleted in
HEAD and renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
core/src/main/java/org/jclouds/rest/internal/ApiContextImpl.java left in tree.
Auto-merging
core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpInvocationModule.java
CONFLICT (rename/delete):
core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
core/src/main/java/org/jclouds/rest/config/SyncToAsyncHttpApiProvider.java left
in tree.
Auto-merging core/src/main/java/org/jclouds/rest/config/HttpApiModule.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/config/HttpApiModule.java
Auto-merging
core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/config/AnnotatedSyncToAsyncHttpApiProvider.java
CONFLICT (rename/delete):
core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
core/src/main/java/org/jclouds/rest/config/AnnotatedHttpApiProvider.java left
in tree.
Auto-merging core/src/main/java/org/jclouds/rest/Utils.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/jclouds/rest/Utils.java
CONFLICT (rename/delete):
core/src/main/java/org/jclouds/rest/HttpApiMetadata.java deleted in HEAD and
renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
core/src/main/java/org/jclouds/rest/HttpApiMetadata.java left in tree.
CONFLICT (rename/delete):
core/src/main/java/org/jclouds/rest/ConfiguresHttpApi.java deleted in HEAD and
renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
core/src/main/java/org/jclouds/rest/ConfiguresHttpApi.java left in tree.
CONFLICT (rename/delete): core/src/main/java/org/jclouds/rest/ApiContext.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of core/src/main/java/org/jclouds/rest/ApiContext.java
left in tree.
Auto-merging core/src/main/java/org/jclouds/rest/AnonymousHttpApiMetadata.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/rest/AnonymousHttpApiMetadata.java
CONFLICT (rename/delete): core/src/main/java/org/jclouds/reflect/Types2.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of core/src/main/java/org/jclouds/reflect/Types2.java left
in tree.
Auto-merging
core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
Auto-merging core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
CONFLICT (modify/delete): core/src/main/java/org/jclouds/io/InputSuppliers.java
deleted in HEAD and modified in refs/tags/changes/52. Version
refs/tags/changes/52 of core/src/main/java/org/jclouds/io/InputSuppliers.java
left in tree.
Auto-merging
core/src/main/java/org/jclouds/config/BindApiContextWithWildcardExtendsExplicitAndRawType.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/jclouds/config/BindApiContextWithWildcardExtendsExplicitAndRawType.java
Auto-merging core/pom.xml
CONFLICT (content): Merge conflict in core/pom.xml
CONFLICT (rename/delete):
common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/OrgNameAndTasksListNameToEndpoint.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/OrgNameAndTasksListNameToEndpoint.java
left in tree.
Auto-merging
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
CONFLICT (add/add): Merge conflict in
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
Auto-merging
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
CONFLICT (content): Merge conflict in
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java
Auto-merging
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/MultipartUploadStrategy.java
CONFLICT (content): Merge conflict in
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/internal/MultipartUploadStrategy.java
Auto-merging
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java
CONFLICT (content): Merge conflict in
apis/swift/src/main/java/org/jclouds/openstack/swift/blobstore/strategy/MultipartUpload.java
CONFLICT (rename/delete):
apis/sts/src/main/java/org/jclouds/sts/config/STSHttpApiModule.java deleted in
HEAD and renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
apis/sts/src/main/java/org/jclouds/sts/config/STSHttpApiModule.java left in
tree.
CONFLICT (rename/delete):
apis/sts/src/main/java/org/jclouds/aws/config/FormSigningHttpApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/sts/src/main/java/org/jclouds/aws/config/FormSigningHttpApiModule.java
left in tree.
CONFLICT (rename/delete):
apis/sts/src/main/java/org/jclouds/aws/config/AWSHttpApiModule.java deleted in
HEAD and renamed in refs/tags/changes/52. Version refs/tags/changes/52 of
apis/sts/src/main/java/org/jclouds/aws/config/AWSHttpApiModule.java left in
tree.
Auto-merging
apis/route53/src/test/java/org/jclouds/route53/functions/SerializeRRSTest.java
CONFLICT (add/add): Merge conflict in
apis/route53/src/test/java/org/jclouds/route53/functions/SerializeRRSTest.java
CONFLICT (rename/delete):
apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/route53/src/main/java/org/jclouds/route53/config/Route53HttpApiModule.java
left in tree.
CONFLICT (rename/delete):
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
left in tree.
CONFLICT (rename/delete):
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
left in tree.
CONFLICT (rename/delete):
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
left in tree.
CONFLICT (rename/delete):
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
left in tree.
Auto-merging
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/config/CloudLoadBalancersHttpApiModule.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/config/CloudLoadBalancersHttpApiModule.java
Auto-merging
apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/options/PaginationOptionsTest.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/options/PaginationOptionsTest.java
Auto-merging
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/options/PaginationOptions.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/options/PaginationOptions.java
CONFLICT (rename/delete):
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/functions/DateParser.java
left in tree.
Auto-merging
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/PaginatedCollection.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/PaginatedCollection.java
Auto-merging
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/SyncToAsyncCloudIdentityAuthenticationApiModule.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/SyncToAsyncCloudIdentityAuthenticationApiModule.java
CONFLICT (rename/delete):
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/config/CloudIdentityAuthenticationApiModule.java
left in tree.
Auto-merging
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityFallbacks.java
CONFLICT (add/add): Merge conflict in
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityFallbacks.java
Auto-merging
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
CONFLICT (content): Merge conflict in
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
CONFLICT (rename/delete):
apis/rackspace-clouddns/src/test/resources/limit-types-list.json deleted in
refs/tags/changes/52 and renamed in HEAD. Version HEAD of
apis/rackspace-clouddns/src/test/resources/limit-types-list.json left in tree.
CONFLICT (rename/delete):
apis/rackspace-clouddns/src/test/resources/limit-list.json deleted in
refs/tags/changes/52 and renamed in HEAD. Version HEAD of
apis/rackspace-clouddns/src/test/resources/limit-list.json left in tree.
CONFLICT (rename/delete):
apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted in refs/tags/changes/52 and renamed in HEAD. Version HEAD of
apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
left in tree.
Auto-merging
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java
CONFLICT (content): Merge conflict in
apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/config/ProviderModuleExpectTest.java
CONFLICT (rename/delete):
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/MappedAuthenticationApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/MappedAuthenticationApiModule.java
left in tree.
CONFLICT (rename/delete):
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/AuthenticationApiModule.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/config/AuthenticationApiModule.java
left in tree.
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmsResponseHandlerTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmsResponseHandlerTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmsForMetricResponseHandlerTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmsForMetricResponseHandlerTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmHistoryResponseHandlerTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/ListAlarmHistoryResponseHandlerTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/SaveAlarmOptionsTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/SaveAlarmOptionsTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmsOptionsTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmsOptionsTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmsForMetricTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmsForMetricTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmHistoryOptionsTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/ListAlarmHistoryOptionsTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
CONFLICT (content): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/AlarmApiLiveTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/AlarmApiLiveTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/AlarmApiExpectTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/AlarmApiExpectTest.java
Auto-merging
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/AlarmNamesBinderTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/AlarmNamesBinderTest.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/MetricAlarmHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/MetricAlarmHandler.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmsResponseHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmsResponseHandler.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmsForMetricResponseHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmsForMetricResponseHandler.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmHistoryResponseHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/ListAlarmHistoryResponseHandler.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/AlarmHistoryItemHandler.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/SaveAlarmOptions.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/SaveAlarmOptions.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmsOptions.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmsOptions.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmsForMetric.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmsForMetric.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmHistoryOptions.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/ListAlarmHistoryOptions.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/handlers/CloudWatchErrorHandler.java
CONFLICT (rename/delete):
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ListAlarmsToPagedIterable.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ListAlarmsToPagedIterable.java
left in tree.
CONFLICT (rename/delete):
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ListAlarmHistoryToPagedIterable.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ListAlarmHistoryToPagedIterable.java
left in tree.
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmAsyncApi.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmAsyncApi.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/AlarmApi.java
CONFLICT (rename/delete):
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/HistoryItemType.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/HistoryItemType.java
left in tree.
CONFLICT (rename/delete):
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ComparisonOperator.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ComparisonOperator.java
left in tree.
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
Auto-merging
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
CONFLICT (add/add): Merge conflict in
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
CONFLICT (rename/delete):
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/AlarmNamesBinder.java
deleted in HEAD and renamed in refs/tags/changes/52. Version
refs/tags/changes/52 of
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/binders/AlarmNamesBinder.java
left in tree.
Auto-merging
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeClientExpectTest.java
CONFLICT (add/add): Merge conflict in
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeClientExpectTest.java
Auto-merging
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContext.java
CONFLICT (content): Merge conflict in
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContext.java
Automatic merge failed; fix conflicts and then commit the result.
stderr: warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3034
and retry the command.
at hudson.plugins.git.GitAPI.launchCommandIn(GitAPI.java:779)
at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:741)
at hudson.plugins.git.GitAPI.launchCommand(GitAPI.java:751)
at hudson.plugins.git.GitAPI.merge(GitAPI.java:349)
... 13 more
