Commit Graph

12439 Commits

Author SHA1 Message Date
liuyq-617 751ac814aa remove taosdemoTest2.py 2021-02-02 14:31:31 +08:00
Shengliang Guan ea0aed5d1e Merge remote-tracking branch 'origin/feature/TD-1925_new' into feature/linux 2021-02-02 14:23:39 +08:00
Haojun Liao 82c8e4501f Merge branch 'develop' into feature/query 2021-02-02 14:15:59 +08:00
Ping Xiao 2257f93209 [TD-2850]<test>: add test case 2021-02-02 14:14:34 +08:00
Shengliang Guan 0f62fa8850 Merge remote-tracking branch 'origin/develop' into feature/linux 2021-02-02 14:03:39 +08:00
liuyq-617 27fa94194b [TD-2882]<test>if core,stop test 2021-02-02 13:51:43 +08:00
zyyang 288dd3e47b change 2021-02-02 13:47:49 +08:00
zyyang e28d6599dc Merge branch 'develop' into feature/TD-2271 2021-02-02 13:46:54 +08:00
zyyang 8759a10ef4 change 2021-02-02 13:45:19 +08:00
dapan1121 6f30ae25af fix bug 2021-02-02 13:43:18 +08:00
liuyq-617 065b84bd6a Merge branch 'feature/TD-1925_new' of github.com:taosdata/TDengine into feature/TD-1925_new 2021-02-02 13:33:31 +08:00
liuyq-617 a4189faca4 modify time in another way 2021-02-02 13:32:08 +08:00
Hongze Cheng 43a2ede931 Merge branch 'feature/TD-1925_new' of https://github.com/taosdata/TDengine into feature/TD-1925_new 2021-02-02 13:20:47 +08:00
Hongze Cheng 3b156b610c fix a possible coredump 2021-02-02 13:17:07 +08:00
haojun Liao 9777218e1b
Merge pull request #5103 from taosdata/hotfix/TD-2902
[TD-2902]Insert affectedRows is not correct with multiple vnodes
2021-02-02 12:56:22 +08:00
haojun Liao f23cc290e1
Merge pull request #5092 from taosdata/hjxilinx-patch-2
[TD-2885]<fix>: fix memory leak.
2021-02-02 12:54:36 +08:00
Shengliang Guan d44f08a8d0 TD-1207 2021-02-02 10:55:38 +08:00
haojun Liao adfb260fb5
Merge branch 'develop' into hjxilinx-patch-2 2021-02-02 10:47:10 +08:00
haojun Liao 71357a214c
Merge pull request #5100 from taosdata/hotfix/TD-2885
Hotfix/td 2885
2021-02-02 10:43:27 +08:00
haojun Liao 1cbaa9da70
Merge pull request #5082 from taosdata/hotfix/TD-2754
[TD-2754]add assert and debug log
2021-02-02 10:40:50 +08:00
haojun Liao 4ceea4838b
Merge pull request #5081 from taosdata/hotfix/TD-2878
[TD-2878]taos crash when an id following like in query sql
2021-02-02 10:39:24 +08:00
huili 9313b0ae57
Merge pull request #5101 from taosdata/test/jenkins
[TD-2883]<test>add jenkins server
2021-02-02 10:14:08 +08:00
liuyq-617 4bec4814fd modify testcase suite 2021-02-02 10:01:59 +08:00
Shengliang Guan 1b8fdd4951 TD-1207 2021-02-02 09:58:22 +08:00
liuyq-617 9845bd94b5 Merge branches 'test/jenkins' and 'feature/TD-1925_new' of github.com:taosdata/TDengine into feature/TD-1925_new 2021-02-02 09:57:23 +08:00
Hongze Cheng e5dce6e125 Merge branch 'develop' into feature/TD-1925_new 2021-02-02 09:50:58 +08:00
liuyq-617 0d46d2b2ec rebalance 2021-02-02 09:34:08 +08:00
liuyq-617 9f0e5d2ef0 rebalance 2021-02-02 09:26:58 +08:00
Shengliang Guan fc429e1271
Merge pull request #5105 from taosdata/fix/TD-2402-v2
[TD-2402]<fix>: set rows <- 1 constantly when update http sql return success
2021-02-02 09:14:27 +08:00
Minglei Jin 002ec75ad1 undo last dummy commit 2021-02-01 19:29:50 +08:00
Minglei Jin fa64ea3d91 dummy commit to restart silly CI 2021-02-01 19:23:53 +08:00
Minglei Jin 427d43dc6f Merge branch 'fix/TD-2402' of https://github.com/taosdata/TDengine into fix/TD-2402 2021-02-01 19:07:26 +08:00
Minglei Jin c45ddcd7d0 general/http/restful_full.sim: fix http return json API changes 2021-02-01 19:05:35 +08:00
Minglei Jin 36049236c7 [TD-2402]<fix>: set rows <- 1 constantly when update http sql return success 2021-02-01 19:05:35 +08:00
liuyq-617 ca9d1fe150 Merge branch 'develop' into test/jenkins 2021-02-01 18:59:27 +08:00
huili 90a60201dd
Merge pull request #5095 from taosdata/feature/linux
Feature/linux
2021-02-01 18:50:27 +08:00
Hongze Cheng db44634958 Merge branch 'develop' into feature/TD-1925_new 2021-02-01 10:39:35 +00:00
dapan1121 7fba734bdd fix bug 2021-02-01 17:59:21 +08:00
Shuduo Sang 6ec2bca1b8 [TD-2901] <fix>: fix bug taosdemo with mono compiled does not exit. 2021-02-01 17:31:05 +08:00
Minglei Jin 7cc4864f39 vnodeCfg/update: fix missing update cfg 2021-02-01 17:27:00 +08:00
Yiqing Liu 7ca3dba05a
Merge branch 'develop' into test/jenkins 2021-02-01 17:21:13 +08:00
liuyq-617 9c80a9b4d6 [TD-2883]<test>add jenkins server 2021-02-01 17:16:43 +08:00
Shengliang Guan 15c83944d3 TD-1207 2021-02-01 17:06:40 +08:00
Minglei Jin 8c6527cd22 general/http/restful_full.sim: fix http return json API changes 2021-02-01 16:44:12 +08:00
Hongze Cheng 3b1f833dab fix compile error 2021-02-01 16:42:21 +08:00
slguan 33803004fb temp remove some case 2021-02-01 16:20:43 +08:00
Hongze Cheng e353e3b946 fsync for file copy 2021-02-01 16:19:22 +08:00
Hongze Cheng 291aaff1c6 fix two review bugs 2021-02-01 16:17:10 +08:00
yihaoDeng 2e34586332 Merge branch 'develop' into TD-2904 2021-02-01 08:08:52 +00:00
yihaoDeng 9c7eb6f94e Merge branch 'hotfix/TD-2904' of https://github.com/taosdata/TDengine into TD-2904 2021-02-01 08:05:43 +00:00