Skip to content

Commit a622864

Browse files
committed
Fix conflict between #83345 and #87269
1 parent 539434d commit a622864

File tree

1 file changed

+1
-1
lines changed
  • x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions

1 file changed

+1
-1
lines changed

x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/RollupActionIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void testRollupIndexInTheHotPhaseAfterRollover() throws Exception {
185185
// add a policy
186186
Map<String, LifecycleAction> hotActions = Map.of(
187187
RolloverAction.NAME,
188-
new RolloverAction(null, null, null, 1L, null),
188+
new RolloverAction(null, null, null, 1L, null, null, null, null, null, null),
189189
RollupILMAction.NAME,
190190
new RollupILMAction(ConfigTestHelpers.randomInterval())
191191
);

0 commit comments

Comments
 (0)