Merge branch 'master' into dev

@@ -6,21 +6,19 @@ redis.readonly.proxy.address=${redis.readonly.proxy.address}
 redis.readonly.proxy.port=${redis.readonly.proxy.port}
 redis.readonly.proxy.auth=${redis.readonly.proxy.auth}
 
-#search
+#es.cluster
 search.es.cluster.name=${search.es.cluster.name}
 search.es.servers=${search.es.servers}
 search.index.number_of_replicas=${search.index.number_of_replicas}
 search.index.refresh_interval=${search.index.refresh_interval}
 search.index.translog.flush_threshold_ops=${search.index.translog.flush_threshold_ops}
-search.index.batch.limit=${search.index.batch.limit}
-search.index.batch.limit.tbl=${search.index.batch.limit.tbl}
-search.index.batch.max.thread.size=${search.index.batch.max.thread.size}
+
+#search
 search.minimum.should.match=${search.minimum.should.match}
 search.operator=${search.operator}
 search.default.field=${search.default.field}
 search.script.score=${search.script.score}
 search.script.lang=${search.script.lang}
-
 search.use.cache=${search.use.cache}
 tpl.adaptor.valid=${tpl.adaptor.valid}