[incubator-iotdb] branch master updated (901012a -> 122fba0)

[lt...@apache.org]

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

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


    from 901012a  fix a bug of renaming tsfile while it has naming conflicts (#640)
     add 597da57  fix null pointer exception in tsfile recover performer
     new 122fba0  Merge pull request #642 from apache/fix_jira_357

The 1 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:
 server/src/main/java/org/apache/iotdb/db/service/IoTDB.java         | 1 -
 .../apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java    | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

[incubator-iotdb] 01/01: Merge pull request #642 from apache/fix_jira_357

[lt...@apache.org]

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

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

commit 122fba054fc825b88b29e3d00736a35e5fe5d678
Merge: 901012a 597da57
Author: Tianan Li <li...@163.com>
AuthorDate: Wed Dec 11 15:09:56 2019 +0800

    Merge pull request #642 from apache/fix_jira_357
    
    [IOTDB-357]Fix NullPointerException in tsfile recover performer

 server/src/main/java/org/apache/iotdb/db/service/IoTDB.java         | 1 -
 .../apache/iotdb/db/writelog/recover/TsFileRecoverPerformer.java    | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)