This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from e68bd0e [merge]Compaction conflicts (#1687)
add 72aa40c [IOTDB-835] Fix delete timeseries and change data type then
write failed (#1625)
add d674035 [hotfix] Delete useless code in Jenkinsfile
add 5709256 add a data migration example (#1601)
add 571b7f5 [IOTDB-841] Unify the IOTDBConfig with iotdb-engine.cofig
(#1629)
add 379a7df disable vm (#1643)
add f0b8a4b [IOTDB-836] Fix merging statistics failed when endFile (#1637)
add 6ef6646 add Delete Storage Group statement to User Guide DDL (#1644)
add e502a4a change prepared statement log level from info to debug (#1649)
add c160923 Fix bug that 'List role privileges' cannot apply to root and
other issues in doc (#1647)
add ec9ef4f [IOTDB-849] Optimize value filter query (#1651)
add fd6992b [IOTDB-682] C++ client build (#1616)
add 9789c2c Update the master branch for releasing 0.10.1 (#1646)
add 12e1332 Support double quotation in Path and optimize the Path String
usage v2 (#1627)
add 4c224bc - Made it possible to load the config from the classpath
(#1661)
add 55c2e20 [IOTDB-855] Put back SessionPool resources if
RuntimeException occurs (#1663)
add afafc79 [IOTDB-839] Make Tablet api more friendly (#1658)
add 2ec3916 fix a bug which caused delete timeseries unsuccessfully
(#1664)
add 2c6e057 resolve grammatical mistake (#1669)
add 76a9aaa [IOTDB-837] ArrayIndexOutOfBoundsException if the
measurementId size is not consistent with the value size (#1662)
add 1fc68e7 IoTDB Session Interface Updates(0.9-0.10) (#1672)
add 988deda fix Chinese webpage translation (#1677)
add 1132192 fixed typo (#1674)
add 11323fe modify data manipulation doc (#1678)
add 393a91f [New feature] Add the alias and show it as column name when
querying (#1621)
add 4cedb4e Add java doc. (#1681)
add 7eeae49 Reduce unnecessary initialization (#1682)
add 1e48707 fix scheduleWithFixedDelay in wal
add 7e3f820 enlarge force_wal_period_in_ms to 100ms
add a7cfb1e Merge pull request #1679 from apache/real_fix_wal
add c626197 [Sonar] Fix Sonar checking bugs (#1673)
add 545d912 Fix thrift put some unnecessary bytes in a ByteBuffer (#1655)
add bb5b9c9 fix conflict
No new revisions were added by this update.
Summary of changes:
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
