This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 14c3d21 Merge remote-tracking branch 'origin/master' into
new_series_reader
add e9d3d96 Revert "[IOTDB-397]fix gc log collection in start-server.sh
scripts" (#730)
add dfa53bc [IOTDB-414] fix the client display and add COMPRESSION
keyword. (#728)
add 8430a6f [IOTDB-415] stop the MetricService if the service start
failed but the socket has... (#729)
add 4d65fd1 Merge remote-tracking branch 'origin/master' into
new_series_reader
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/client/AbstractClient.java | 27 +++++++++----------
.../UserGuide/3-Server/4-Config Manual.md | 19 +------------
.../UserGuide/3-Server/4-Config Manual.md | 20 +-------------
server/src/assembly/resources/conf/iotdb-env.bat | 29 +++++++++-----------
server/src/assembly/resources/conf/iotdb-env.sh | 31 +++++-----------------
.../src/assembly/resources/sbin/start-server.bat | 2 +-
server/src/assembly/resources/sbin/start-server.sh | 6 +----
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 6 ++++-
.../apache/iotdb/db/service/MetricsService.java | 19 +++++++++----
9 files changed, 54 insertions(+), 105 deletions(-)
