Commit Graph

7327 Commits

Author SHA1 Message Date
Hui Li 12ba6ab368 [fix bug] 2020-08-21 12:00:04 +08:00
Hui Li e2a18afc76 [TD-1162] 2020-08-20 18:28:55 +08:00
Hui Li 94c11e0f67 [TD-1162] 2020-08-20 16:37:35 +08:00
Hui Li 4104f7f434 [TD-1190] 2020-08-20 15:35:00 +08:00
Shengliang Guan a384322ab0
Merge pull request #3160 from taosdata/hotfix/jdbcmemleak
Hotfix/jdbcmemleak
2020-08-20 15:13:11 +08:00
Haojun Liao fee9f74040 fix jdbc memory leaks. #3098 2020-08-20 15:01:09 +08:00
Haojun Liao c960858088 fix jdbc memory leaks. #3098 2020-08-20 14:24:11 +08:00
Shengliang Guan 197e59d89c
Merge pull request #3152 from taosdata/hotfix/jdbcmemleak
fix jdbc memleaks  #3098
2020-08-20 10:46:52 +08:00
Haojun Liao e9bba3cdd7 fix jdbc memleaks #3098 2020-08-20 10:43:43 +08:00
Shengliang Guan 644749a348
Merge pull request #3146 from taosdata/fmaster/lihui
[TD-1171]
2020-08-19 22:29:59 +08:00
Shengliang Guan ab898c0607
Merge pull request #3144 from taosdata/hotfix/not_remove_file
not remove tsdb dir
2020-08-19 22:29:22 +08:00
Hui Li ac7da458e6 [TD-1171] 2020-08-19 19:23:03 +08:00
Shengliang Guan 69211ec363
Merge pull request #3143 from taosdata/hotfix/os
TD-1186 show database error while in different account
2020-08-19 18:10:40 +08:00
Hongze Cheng 5c466ce2a2 not remove tsdb dir 2020-08-19 18:05:36 +08:00
Shengliang Guan ecb7d9529b TD-1186 show database error while in different account 2020-08-19 09:58:54 +00:00
Shengliang Guan f9df4e3584
Merge pull request #3139 from taosdata/hotfix/os
TD-1090
2020-08-19 16:24:14 +08:00
Shengliang Guan a175845887 minor changes 2020-08-19 05:55:00 +00:00
Shengliang Guan 6ff0bb47ea TD-1090 2020-08-19 09:58:05 +08:00
Shengliang Guan 173f194895
Merge pull request #3126 from taosdata/hotfix/os
fix coverity defects
2020-08-18 18:44:40 +08:00
Shengliang Guan 152867cb2d minor changes 2020-08-18 06:49:24 +00:00
Shengliang Guan 0698465236 The mqtt test has not passed, there are memory leaks, waiting for reconstruction 2020-08-18 06:40:33 +00:00
Shengliang Guan ab5693295e TD-1165 2020-08-18 02:11:33 +00:00
Shengliang Guan 4e1de7fbe1
Merge pull request #3110 from taosdata/hotfix/os
TD-1144 fix bug while redirect status msg
2020-08-18 09:42:23 +08:00
Shengliang Guan 25fe2350d0 TD-1144 fix bug while redirect status msg 2020-08-17 15:35:36 +00:00
Shengliang Guan e1f14cfe7d
Merge pull request #3104 from taosdata/hotfix/os
TD-1165 fix defects found by coverity scan
2020-08-17 22:53:23 +08:00
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