Merge remote-tracking branch 'origin2/master' into pick-wm
authorRuiLei <ruileisurprise@gmail.com>
Sat, 27 Jul 2019 08:45:43 +0000 (16:45 +0800)
committerRuiLei <ruileisurprise@gmail.com>
Sat, 27 Jul 2019 08:45:43 +0000 (16:45 +0800)
commit3cfea15ea3b72043032225472f4b319553610c9e
tree8a9dc2a82c372babd1e9b86ef752dc8cddd3c931
parent3025bb0d286e99fb64a240f3a517e64dcdcbc9e5
parentd6f0ffcb1918bcf7bbe08690ec8d6691d4fbadca
Merge remote-tracking branch 'origin2/master' into pick-wm
server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java