This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from f179e07 Merge branch 'master' into dev_merge
add 4f09b76 add a test
No new revisions were added by this update.
Summary of changes:
.../iotdb/db/integration/IoTDBMergeTest.java | 98 ++++++++++++++++++++++
1 file changed, 98 insertions(+)
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
