This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DeleteInsertBug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 55526cc resolve conflict
add d9142d8 for QIAO
add b008a48 Merge branch 'DeleteInsertBug' of
https://github.com/apache/incubator-iotdb into DeleteInsertBug
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/metadata/MManager.java | 4 ++--
.../iotdb/db/metadata/mnode/InternalMNode.java | 25 +++++++++++++++++++++-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 21 +-----------------
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 6 +++---
4 files changed, 30 insertions(+), 26 deletions(-)
