Commit Graph

6856 Commits

Author SHA1 Message Date
Hui Li 8e64411cd1 [modify http port from 6020 to 6041] 2020-08-03 17:07:49 +08:00
Hui Li 644c333c68 [modify http port from 6020 to 6041] 2020-08-03 17:04:12 +08:00
Hui Li 9ad421c294 [modify http port from 6020 to 6041] 2020-08-03 16:52:46 +08:00
Yiqing Liu 8a55c6c86a
Merge pull request #2901 from taosdata/Aries-Lee1991-patch-1
Update README.md
2020-08-03 16:19:23 +08:00
Xiaxin Li fe2701a3fd
Update README.md 2020-08-03 16:17:45 +08:00
Shengliang Guan 3a49e58723
Merge pull request #2899 from taosdata/patch/pump-up-alert-ver
pump up alert version to 2.0
2020-08-03 16:00:50 +08:00
Shengliang Guan 5d51c31557
Merge pull request #2898 from taosdata/hotfix/sangshuduo/add-timeout-for-influxdbtest
fix influxdbTest timeout error
2020-08-03 16:00:31 +08:00
Bomin Zhang b22c232890 pump up alert version to 2.0 2020-08-03 15:53:59 +08:00
Shuduo Sang 09193a227f fix influxdbTest timeout error
[TD-1051]
2020-08-03 15:33:29 +08:00
Xiaxin Li 9e489f79c5
Merge pull request #2896 from taosdata/feature/pyconn
minor edit
2020-08-03 14:57:12 +08:00
liu0x54 cfc08c4e77 minor edit 2020-08-03 06:53:10 +00:00
Xiaxin Li 76b32d9c57
Merge pull request #2895 from taosdata/liuyq-617-patch-2
Update Model-ch.md
2020-08-03 14:35:08 +08:00
Yiqing Liu a6fbe4bcc5
Update Model-ch.md 2020-08-03 14:32:36 +08:00
Xiao Ping e5b15715fe
Merge pull request #2894 from taosdata/liuyq-617-patch-1
Update Model-ch.md
2020-08-03 14:28:02 +08:00
Yiqing Liu dca08271c9
Update Model-ch.md 2020-08-03 14:26:35 +08:00
Shengliang Guan 641f4e1066
Merge pull request #2893 from taosdata/develop
Merge from develop into master
2020-08-03 14:02:37 +08:00
Shengliang Guan 8723f0bdfb
Merge pull request #2892 from taosdata/liuyq-617-patch-1
Update Model-ch.md
2020-08-03 14:00:40 +08:00
Shengliang Guan d0e99de2e1
Merge pull request #2889 from taosdata/update_jdbc_md
update doc for JDBC
2020-08-03 14:00:17 +08:00
Shengliang Guan 451a39d495
Merge pull request #2890 from taosdata/feature/2.0tsdb
add file version TSDB file and meta file
2020-08-03 13:59:49 +08:00
Shengliang Guan da4a6c405f
Merge pull request #2891 from taosdata/feature/pyconn
[TD-1000] fix typo
2020-08-03 13:59:22 +08:00
Yiqing Liu 264a42d643
Update Model-ch.md
change format
2020-08-03 13:54:43 +08:00
Hongze Cheng ee4ab1c472 fix TD-969 2020-08-03 13:44:02 +08:00
liu0x54 11cf659ffe [TD-1000] fix typo 2020-08-03 05:37:14 +00:00
Hongze Cheng 8e9ec20149 add file version TSDB file and meta file 2020-08-03 13:16:10 +08:00
Ping Xiao aeed5de716 update doc for JDBC 2020-08-03 13:14:09 +08:00
Shengliang Guan e2dca8291a
Merge pull request #2887 from taosdata/develop
Merge develop into master
2020-08-03 13:07:18 +08:00
Shengliang Guan 6fd3fc345a
Merge pull request #2865 from taosdata/updatetestcase
add client test cases
2020-08-03 12:03:23 +08:00
Shengliang Guan 634d8968d6
Merge pull request #2886 from taosdata/feature/td-1033
TD-1033: enable telemetry reporting by default
2020-08-03 11:50:16 +08:00
Bomin Zhang ca9c0ad282 TD-1033: enable telemetry reporting by default
disable telemetry reporting in test.
fix other telemetry related bugs.
2020-08-03 11:31:14 +08:00
Ping Xiao b5226a8d05 remove local command 2020-08-03 11:22:50 +08:00
Ping Xiao eaa5582a01 Merge branch 'develop' into updatetestcase 2020-08-03 10:50:42 +08:00
Ping Xiao b34a726e28 fix CI failure 2020-08-03 10:49:08 +08:00
Shengliang Guan a63daaf77c
Merge pull request #2883 from taosdata/feature/td-1033
td-1033: fix high cpu usage
2020-08-03 09:29:32 +08:00
Bomin Zhang 05c356280e td-1033: fix high cpu usage 2020-08-03 09:18:54 +08:00
Shengliang Guan 1e5f3c509c
Merge pull request #2882 from taosdata/feature/platform
Modify the incorrect use of tqueue
2020-08-02 22:05:55 +08:00
Shengliang Guan ce3d4a79a6 minor changes 2020-08-02 21:37:40 +08:00
Shengliang Guan 9bc8158246 Modify the incorrect use of tqueue 2020-08-02 21:33:05 +08:00
Shengliang Guan 919958dbba
Merge pull request #2881 from taosdata/feature/platform
unlock dbmutex while create vgroup failed
2020-08-02 20:56:07 +08:00
Shengliang Guan 28cc613e19 unlock dbmutex while create vgroup failed 2020-08-02 20:54:29 +08:00
Shengliang Guan b3e7662b13
Merge pull request #2880 from taosdata/feature/platform
Feature/platform
2020-08-02 20:24:47 +08:00
Shengliang Guan 1fe3dbebfb set telemetryReporting default val to false 2020-08-02 11:48:42 +00:00
Shengliang Guan 8a68dd6e6b [TD-1033] change clusterId to string 2020-08-02 11:43:07 +00:00
Shengliang Guan 128c8064a2 Merge branch 'develop' into updatetestcase 2020-08-02 07:36:53 +00:00
Shengliang Guan 511bbe2f35
Merge pull request #2879 from taosdata/feature/platform
Feature/platform
2020-08-02 15:35:42 +08:00
Shengliang Guan 0fa71ca0d3
Merge pull request #2878 from taosdata/feature/sangshuduo/perftest-script-improve
add opentsdbTestWriteLoop.sh
2020-08-02 15:21:55 +08:00
Shengliang Guan b536877f51 TD-1038 TD-1040 2020-08-02 15:14:44 +08:00
Shengliang Guan 41f4605348 Merge remote-tracking branch 'origin/develop' into feature/platform 2020-08-02 12:23:10 +08:00
Shuduo Sang 035a9ab943 add opentsdbTestWriteLoop.sh 2020-08-02 12:00:11 +08:00
Shengliang Guan 6e250e5469
Merge pull request #2877 from taosdata/hotfix/sangshuduo/fix-opentsdb-test-ip
fix hard code server ip in opentsdb test program.
2020-08-02 11:58:07 +08:00
Shuduo Sang d0059dfff2 fix hard code server ip in opentsdb test program.
[TD-1042]
2020-08-02 11:51:07 +08:00