Merge remote-tracking branch 'origin/master' into fix_license
authorxiangdong huang <sainthxd@gmail.com>
Mon, 21 Jan 2019 06:32:53 +0000 (14:32 +0800)
committerxiangdong huang <sainthxd@gmail.com>
Mon, 21 Jan 2019 06:32:53 +0000 (14:32 +0800)
commit4a55823ab8a972aa48581925b01c71f9bca59ac4
tree80338c6dd8e3e12d3785c2372d6b89f2db2b504e
parentf7b9c64f7038ba58ef13b4b3ccdc74050f20280e
parenteb922eaf8fe506996d6312cb4635ddc2b3101c3e
Merge remote-tracking branch 'origin/master' into fix_license
29 files changed:
grafana/pom.xml
iotdb-cli/pom.xml
iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientIT.java
iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptIT.java
iotdb/iotdb/conf/iotdb-engine.properties
iotdb/pom.xml
iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
iotdb/src/main/java/org/apache/iotdb/db/writelog/io/ILogWriter.java
iotdb/src/main/java/org/apache/iotdb/db/writelog/io/LogWriter.java
iotdb/src/main/java/org/apache/iotdb/db/writelog/manager/MultiFileLogNodeManager.java
iotdb/src/main/java/org/apache/iotdb/db/writelog/node/ExclusiveWriteLogNode.java
iotdb/src/main/java/org/apache/iotdb/db/writelog/node/WriteLogNode.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBDaemonIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBEngineTimeGeneratorIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLimitSlimitIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSequenceDataQueryIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
iotdb/src/test/java/org/apache/iotdb/db/writelog/PerformanceTest.java
jdbc/pom.xml
service-rpc/pom.xml
tsfile/pom.xml