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

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


    from 917ea9f  Merge branch 'master' into cluster_new
     add 217257c  Update RocketMQ example with session API (#676)
     add cd776ce  update develop-chinese (#694)
     add 867a0ae  Fix bug IOTDB-159
     add 20b42cd  Merge pull request #693 from LeiRui/IOTDB-159
     add 5c524e7  Rename Session to Native API (#695)
     add 72a3044  fix a grammar
     add ddf75da  Merge branch 'master' into cluster_new

No new revisions were added by this update.

Summary of changes:
 docs/Development-Chinese.md                        | 27 +++---
 ... - Session.md => 2-Programming - Native API.md} | 19 ++---
 ...ogramming - JDBC.md => 3-Programming - JDBC.md} |  0
 ... - Session.md => 2-Programming - Native API.md} | 19 ++---
 ...ogramming - JDBC.md => 3-Programming - JDBC.md} |  9 +-
 .../4-Client/5-Programming - TsFile API.md         |  3 +-
 example/rocketmq/pom.xml                           |  2 +-
 example/rocketmq/readme.md                         | 14 +++-
 .../java/org/apache/iotdb/rocketmq/Constant.java   | 62 +++++++-------
 .../apache/iotdb/rocketmq/RocketMQConsumer.java    | 97 ++++++++++++++--------
 .../apache/iotdb/rocketmq/RocketMQProducer.java    |  1 +
 .../main/java/org/apache/iotdb/rocketmq/Utils.java |  2 +-
 .../main/java/org/apache/iotdb/SessionExample.java | 15 ++++
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  3 +
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  3 +
 15 files changed, 160 insertions(+), 116 deletions(-)
 rename docs/Documentation-CHN/UserGuide/4-Client/{3-Programming - Session.md 
=> 2-Programming - Native API.md} (81%)
 rename docs/Documentation-CHN/UserGuide/4-Client/{2-Programming - JDBC.md => 
3-Programming - JDBC.md} (100%)
 rename docs/Documentation/UserGuide/4-Client/{3-Programming - Session.md => 
2-Programming - Native API.md} (91%)
 rename docs/Documentation/UserGuide/4-Client/{2-Programming - JDBC.md => 
3-Programming - JDBC.md} (98%)

Reply via email to