[incubator-iotdb] branch master updated (f718837 -> 1c83237)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from f718837  Merge pull request #319 from apache/feature_add_flush_queue_jmx_interface
     new a83f7f3  add -e option for iotdb client
     new 0c5243f  fix apache license
     new b573ba0  fix UT for unix
     new 1a92040  fix apache license
     new 1e09a2a  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     new 94bca89  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     new 9767bd2  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     new 4f1a928  Merge branch 'master' of https://github.com/apache/incubator-iotdb
     new 4d8991a  complete the doc for client -e parameter
     new 2cc202e  complete doc for Cli/Shell -e parameter
     new 94eac46  fix apache license
     new 1c83237  Merge pull request #301 from EJTTianYu/master

The 1840 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 client/src/assembly/resources/sbin/start-client.sh |  4 --
 .../apache/iotdb/cli/client/AbstractClient.java    | 46 ++++++++++++++++++-
 .../java/org/apache/iotdb/cli/client/Client.java   | 21 +++++++--
 .../iotdb/cli/client/StartClientScriptIT.java      |  3 +-
 docs/Documentation-CHN/UserGuide/8-Tools-Cli.md    | 51 +++++++++++++++++++++-
 docs/Documentation/UserGuide/8-Tools-Cli.md        | 41 ++++++++++++++++-
 6 files changed, 154 insertions(+), 12 deletions(-)