Skip to content

Commit 360169d

Browse files
committed
Merge remote-tracking branch 'upstream/elasticity' into importWithHostingGoal
2 parents 440307f + a74af2a commit 360169d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/maven-full-its.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,21 @@ jobs:
127127
MAVEN_OPTS: -Djansi.force=true
128128
- name: Upload unit test results
129129
if: ${{ failure() }}
130-
uses: actions/upload-artifact@v3
130+
uses: actions/upload-artifact@v4
131131
with:
132132
name: surefire-reports-${{ matrix.profile.name }}
133133
path: ./**/target/surefire-reports/
134134
if-no-files-found: ignore
135135
- name: Upload integration test results
136136
if: ${{ failure() }}
137-
uses: actions/upload-artifact@v3
137+
uses: actions/upload-artifact@v4
138138
with:
139139
name: failsafe-reports-${{ matrix.profile.name }}
140140
path: ./**/target/failsafe-reports/
141141
if-no-files-found: ignore
142142
- name: Upload mini test logs
143143
if: ${{ failure() }}
144-
uses: actions/upload-artifact@v3
144+
uses: actions/upload-artifact@v4
145145
with:
146146
name: mini-tests-logs-${{ matrix.profile.name }}
147147
path: ./**/target/**/mini-tests/**/logs/

.github/workflows/maven-on-demand.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,21 @@ jobs:
102102
MAVEN_OPTS: -Djansi.force=true
103103
- name: Upload unit test results
104104
if: ${{ failure() }}
105-
uses: actions/upload-artifact@v3
105+
uses: actions/upload-artifact@v4
106106
with:
107107
name: surefire-reports
108108
path: ./**/target/surefire-reports/
109109
if-no-files-found: ignore
110110
- name: Upload integration test results
111111
if: ${{ failure() }}
112-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v4
113113
with:
114114
name: failsafe-reports
115115
path: ./**/target/failsafe-reports/
116116
if-no-files-found: ignore
117117
- name: Upload mini test logs
118118
if: ${{ failure() }}
119-
uses: actions/upload-artifact@v3
119+
uses: actions/upload-artifact@v4
120120
with:
121121
name: mini-tests-logs
122122
path: ./**/target/**/mini-tests/**/logs/

.github/workflows/maven.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,21 @@ jobs:
111111
MAVEN_OPTS: -Djansi.force=true
112112
- name: Upload unit test results
113113
if: ${{ failure() }}
114-
uses: actions/upload-artifact@v3
114+
uses: actions/upload-artifact@v4
115115
with:
116116
name: surefire-reports-${{ matrix.profile.name }}
117117
path: ./**/target/surefire-reports/
118118
if-no-files-found: ignore
119119
- name: Upload integration test results
120120
if: ${{ failure() }}
121-
uses: actions/upload-artifact@v3
121+
uses: actions/upload-artifact@v4
122122
with:
123123
name: failsafe-reports-${{ matrix.profile.name }}
124124
path: ./**/target/failsafe-reports/
125125
if-no-files-found: ignore
126126
- name: Upload mini test logs
127127
if: ${{ failure() }}
128-
uses: actions/upload-artifact@v3
128+
uses: actions/upload-artifact@v4
129129
with:
130130
name: mini-tests-logs-${{ matrix.profile.name }}
131131
path: ./**/target/**/mini-tests/**/logs/

server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletsMutatorImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Ample.OperationRequirements mutateTablet(KeyExtent extent) {
8383
}
8484

8585
Preconditions.checkState(extents.putIfAbsent(extent.toMetaRow(), extent) == null,
86-
"Duplicate extents not handled");
86+
"Duplicate extents not handled %s", extent);
8787
return new ConditionalTabletMutatorImpl(this, context, extent, mutations::add,
8888
rejectedHandlers::put);
8989
}

0 commit comments

Comments
 (0)