Commit Graph

12412 Commits

Author SHA1 Message Date
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
slguan ddd9c137c0 compile error in mac 2021-02-01 15:59:17 +08:00
Minglei Jin f5ae929238 [TD-2402]<fix>: set rows <- 1 constantly when update http sql return success 2021-02-01 15:57:50 +08:00
Shengliang Guan f441be13e4 TD-1207 2021-02-01 15:39:45 +08:00
Shengliang Guan fd9847a25d TD-1207 2021-02-01 15:02:38 +08:00
Hongze Cheng 89d9be4d78 fix compile issue 2021-02-01 14:26:46 +08:00
dapan1121 391ff51a5d fix bug 2021-02-01 14:06:08 +08:00
Hongze Cheng 7ffafb5f16 refact 2021-02-01 13:59:42 +08:00
Shengliang Guan a8928b044d TD-1207 2021-02-01 13:53:06 +08:00
zyyang e396b608ae change 2021-02-01 13:21:30 +08:00
zyyang f2ba1f79b8 change 2021-02-01 13:08:06 +08:00
zyyang b0c7a36e73 change 2021-02-01 13:02:12 +08:00
Shengliang Guan 6ca40de987 TD-1207 2021-02-01 11:51:30 +08:00
Shengliang Guan 3a2e0297cc
Merge pull request #5086 from taosdata/test/jenkins
[TD-2493]<test>exclude md,connector,Jenkinsfile
2021-02-01 11:48:59 +08:00
Shengliang Guan 45f9177ec5 Merge remote-tracking branch 'origin/develop' into feature/linux 2021-02-01 11:33:24 +08:00
Shengliang Guan 00916632b4 Merge remote-tracking branch 'origin/develop' into feature/linux 2021-02-01 11:32:32 +08:00
Shengliang Guan cb167af5b3 TD-1207 2021-02-01 11:30:22 +08:00
Haojun Liao 3004887c0f Merge branch 'develop' into feature/query 2021-02-01 11:26:05 +08:00
haojun Liao 107bfc250e
Merge pull request #5094 from taosdata/hotfix/TD-2884
TD-2884
2021-02-01 11:24:44 +08:00
Hongze Cheng 93ff8b4c7e fix compile error 2021-02-01 09:58:22 +08:00
Hongze Cheng c36171e3d2 Merge branch 'develop' into feature/TD-1925_new 2021-02-01 09:46:41 +08:00
Shengliang Guan da8d2fe495
Merge pull request #5091 from taosdata/feature/sangshuduo/TD-2891-get-cmdline-by-pid-on-mac
[TD-2891] <feature>: get process cmdline by pid on mac.
2021-02-01 09:27:29 +08:00
Shengliang Guan 559a0779b6
Merge pull request #5074 from taosdata/fix/TD-2875
[TD-2875]<fix>: use monotonic clock source
2021-02-01 09:26:35 +08:00
Shengliang Guan 57502cd9c0 windows compile 2021-01-31 21:30:56 +08:00
yihaoDeng 254d91862b fix mem leak 2021-01-31 08:20:56 +00:00
yihaoDeng d324102f85 TD-2885 2021-01-31 00:05:33 +00:00
yihaoDeng 93f4c2be96 td-2894 2021-01-30 23:00:31 +00:00