honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed issues after merging in master

This commit is contained in:
Martijn van Groningen 2018-04-20 07:59:13 +02:00
parent f97aec7b8b
commit cfd7847628
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/bulk/TransportBulkShardOperationsAction.java
View File

@ -47,7 +47,7 @@ public class TransportBulkShardOperationsAction
indexNameExpressionResolver, indexNameExpressionResolver,
BulkShardOperationsRequest::new, BulkShardOperationsRequest::new,
BulkShardOperationsRequest::new, BulkShardOperationsRequest::new,
ThreadPool.Names.BULK); ThreadPool.Names.WRITE);
} }
@Override @Override

3
x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
View File

@ -281,7 +281,8 @@ public class FollowingEngineTests extends ESTestCase {
xContentRegistry, IndexSettingsModule.newIndexSettings(shardId.getIndexName(), indexSettings.getSettings())), xContentRegistry, IndexSettingsModule.newIndexSettings(shardId.getIndexName(), indexSettings.getSettings())),
new NoneCircuitBreakerService(), new NoneCircuitBreakerService(),
() -> SequenceNumbers.NO_OPS_PERFORMED, () -> SequenceNumbers.NO_OPS_PERFORMED,
() -> primaryTerm.get() () -> primaryTerm.get(),
EngineTestCase::createTombstoneDoc
); );
} }