Commit Graph

7302 Commits

Author SHA1 Message Date
Shengliang Guan a2fbca353a TD-1154 minor changes for windows compile 2020-08-17 17:56:43 +08:00
Shengliang Guan 07a77ca0d0 Merge remote-tracking branch 'origin/master' into hotfix/os 2020-08-17 09:47:55 +00:00
Shengliang Guan 3595d06a64 TD-1165 fix defects found by coverity scan 2020-08-17 09:47:00 +00:00
Shengliang Guan 974dc452a3
Merge pull request #3102 from taosdata/hotfix/os
TD-1154 #1112 How to modify root's password when I have forgot it?
2020-08-17 17:46:51 +08:00
Shengliang Guan e89ab2c7d5 Merge remote-tracking branch 'origin/master' into hotfix/os 2020-08-17 17:37:26 +08:00
Shengliang Guan 920cfc5981 TD-1154 #1112 How to modify root's password when I have forgot it? 2020-08-17 08:41:55 +00:00
Shengliang Guan d699f81f7f
Merge pull request #3101 from taosdata/hotfix/cover_scan
fix part of coverity scan problem
2020-08-17 15:01:15 +08:00
Hongze Cheng e80c5f3282 fix part of coverity scan problem 2020-08-17 14:44:50 +08:00
Shengliang Guan b18b5e14b5
Merge pull request #3097 from taosdata/hotfix/os
TD-1155 #2977 query result from rest interface is different from shell
2020-08-17 13:54:09 +08:00
Shengliang Guan b9672029cf TD-1155 #2977 query result from rest interface is different from taos console 2020-08-17 03:45:33 +00:00
Shengliang Guan 72cc08fe94
Merge pull request #3096 from taosdata/release/v2.0.1.0
[update version]
2020-08-17 11:28:46 +08:00
Shengliang Guan 06bfe98756
Merge pull request #3093 from taosdata/develop
Merge from develop into master
2020-08-17 11:26:53 +08:00
Hui Li 5fa71e9848 [update version] 2020-08-17 11:21:28 +08:00
Shengliang Guan 4361c2bcee
Merge pull request #3091 from taosdata/feature/sangshuduo/perftest-script-improve
Feature/sangshuduo/perftest script improve
2020-08-17 10:00:29 +08:00
Shengliang Guan d918ed1372
Merge pull request #3089 from taosdata/master
Master
2020-08-17 09:59:47 +08:00
Shuduo Sang 3c046d8904 fix typo. 2020-08-17 00:01:12 +08:00
Shuduo Sang fd06908fce fix conflicts. 2020-08-16 23:47:50 +08:00
Shuduo Sang 100e4d3f98 update influxdb test scripts 2020-08-16 23:41:38 +08:00
Shengliang Guan 7ac6c2b8de
Merge pull request #3090 from taosdata/hotfix/os
TD-1124
2020-08-16 23:40:35 +08:00
Shengliang Guan ff75c2cf11 TD-1124 2020-08-16 15:39:31 +00:00
Shengliang Guan 74e53c6eb0
Merge pull request #3088 from taosdata/develop
Merge from develop into master
2020-08-16 23:26:21 +08:00
Shengliang Guan 95997086ee
Merge pull request #3087 from taosdata/feature/2.0tsdb
Feature/2.0tsdb
2020-08-16 19:55:51 +08:00
Shengliang Guan 3e024c8ec1
Merge pull request #3086 from taosdata/develop
Merge from develop into master
2020-08-16 19:55:26 +08:00
Hongze Cheng 051d2c33c6 fix compile error 2020-08-16 15:37:12 +08:00
Hongze Cheng df288e779e fix sync memory leak 2020-08-16 15:35:51 +08:00
Hongze Cheng b0c9fc3201 fix bug 2020-08-16 15:32:09 +08:00
Shengliang Guan f89e01689b
Merge pull request #3085 from taosdata/patch/td-1111
update java document for subscription
2020-08-16 12:05:06 +08:00
Bomin Zhang cef379d992 update java document for subscription 2020-08-15 16:24:20 +08:00
Shengliang Guan 321aa289f3
Merge pull request #3084 from taosdata/TD-1111_feature
Td 1111 feature
2020-08-15 16:01:24 +08:00
Shengliang Guan bfac4364e7
Merge pull request #3082 from taosdata/feature/os
TD-1047 iconv compile options
2020-08-15 15:35:24 +08:00
zyyang 5ee411fe55 doc update: add jdbc example for data subscribe 2020-08-15 15:22:45 +08:00
zyyang 40772c1e1f update doc: add jdbc example for data subscribe 2020-08-15 15:17:58 +08:00
Shengliang Guan 30bccbd755
Merge pull request #3081 from taosdata/hotfix/tomaster
Merge from develop to master
2020-08-15 14:53:35 +08:00
Shengliang Guan acdcd47243 a crash generated by dn3_mn1_replica_change.sim 2020-08-15 14:52:38 +08:00
Shengliang Guan 22cb8287b5 TD-1047 minor changes for libiconv 2020-08-15 14:29:35 +08:00
Shengliang Guan 6143e72b1c TD-1047 iconv compile options 2020-08-15 14:20:20 +08:00
Shengliang Guan b114fb5150
Merge branch 'master' into hotfix/tomaster 2020-08-15 14:18:19 +08:00
Shengliang Guan 333934e77d
Merge pull request #3080 from taosdata/bugfix/td-1150
fix td-1150
2020-08-15 14:13:32 +08:00
Shengliang Guan 9aa8c1800f
Merge pull request #3079 from taosdata/hotfix/sangshuduo/fix-macro-position-for-random-test
move macro definition position for random test.
2020-08-15 13:56:52 +08:00
Shengliang Guan 587a4e1370
Merge pull request #3078 from taosdata/TD-1111_feature
update doc: add jdbc example for data subscribe
2020-08-15 13:51:12 +08:00
Shengliang Guan 12ce8d2569
Merge pull request #3077 from taosdata/hotfix/TD-1147
TD-1147
2020-08-15 13:50:56 +08:00
Bomin Zhang c5ae6d2aaf fix td-1150 2020-08-15 13:43:20 +08:00
Shuduo Sang a6f1583f81 move macro definition position for random test. 2020-08-15 13:33:58 +08:00
zyyang fae6f1f975 update doc: add jdbc example for data subscribe 2020-08-15 12:51:34 +08:00
yihaoDeng b13a1dda00 TD-1147 2020-08-15 04:25:34 +00:00
Shengliang Guan afd940d903
Merge pull request #3073 from taosdata/feature/os
TD-1057 not show error if create file failed
2020-08-14 20:36:19 +08:00
Shengliang Guan b3dbd8c07c
Merge pull request #3074 from taosdata/feature/sangshuduo/perftest-script-improve
update  influxdbTestWriteLoop.sh
2020-08-14 20:36:01 +08:00
Shengliang Guan 500fcb26e9
Merge pull request #3072 from taosdata/taos_sql_md_update
udpate taos sql md
2020-08-14 18:55:33 +08:00
Shuduo Sang aa33984c28 add influxdbTestWriteLoop.sh 2020-08-14 18:51:10 +08:00
Shengliang Guan c4f1db3ec7 TD-1057 not show error if create file failed 2020-08-14 18:50:29 +08:00