Merge staging into production #198

Merged
merged 4 commits into from Jan 6, 2017
Jump to file or symbol
Failed to load files and symbols.
+0 −2
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Remove deprecated index_concurrency setting

This parameter is removed in Elasticsearch 5. It never really had much
of an effect considering that our imports are not generally limited by
Elasticsearch performance (it's the Node.js importer processes that are
the bottleneck).
  • Loading branch information...
orangejulius committed Dec 5, 2016
commit 7224b1fd4fb5eceab8905c236478f03c6a8f590f
@@ -1567,7 +1567,6 @@
"index": {
"number_of_replicas": "999",
"number_of_shards": "1",
- "index_concurrency": "10",
"refresh_interval": "1m"
}
},
View
@@ -430,7 +430,6 @@ module.exports.tests.index = function(test, common) {
t.equal(typeof s.index, 'object', 'index specified');
t.equal(s.index.number_of_replicas, "0", 'replicas will increase index time');
t.equal(s.index.number_of_shards, "1", 'sharding is only required in a distributed env');
- t.equal(s.index.index_concurrency, "10", 'number of concurrent threads that are allowed to perform indexing at the same time');
t.end();
});
};