Commit Graph

12274 Commits

Author SHA1 Message Date
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 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
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
slguan 33803004fb temp remove some case 2021-02-01 16:20:43 +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
Shengliang Guan a8928b044d TD-1207 2021-02-01 13:53:06 +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 107bfc250e
Merge pull request #5094 from taosdata/hotfix/TD-2884
TD-2884
2021-02-01 11:24:44 +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 d324102f85 TD-2885 2021-01-31 00:05:33 +00:00
yihaoDeng 93f4c2be96 td-2894 2021-01-30 23:00:31 +00:00
yihaoDeng b6a733ee8a TD-2884 2021-01-30 16:29:00 +00:00
haojun Liao 98fd89a566
[TD-2885]<fix>: fix memory leak. 2021-01-30 22:54:25 +08:00
Shuduo Sang a3f537f4d5 [TD-2891] <feature>: get process cmdline by pid on mac. 2021-01-30 18:34:39 +08:00
Hongze Cheng 3e31cdbeae refact 2021-01-29 15:17:18 +08:00
liuyq-617 bb7c5da55d revert 2021-01-29 15:02:40 +08:00
liuyq-617 a9d233ec7c test 2021-01-29 14:59:08 +08:00
liuyq-617 5bce8278b1 [TD-2493]<test>exclude md,connector,Jenkinsfile 2021-01-29 14:53:03 +08:00
huili d9baeab1fa
Merge pull request #5077 from taosdata/xiaoping/add_test_case
[TD-2801]<test>: add test case
2021-01-29 14:10:36 +08:00
Minglei Jin ea981d0806 monotonic/msvclibx: fix compilation on linux 2021-01-29 13:23:28 +08:00
dapan1121 8c61951fe5 fix bug 2021-01-29 13:06:58 +08:00
Shengliang Guan b834fb6f37 msvclibx/clock_gettime: add CLOCK_MONOTONIC to msvclibx 2021-01-29 12:50:52 +08:00
Hongze Cheng a76580bc86 refact 2021-01-29 11:49:38 +08:00
dapan1121 1065fbd7ea fix bug 2021-01-29 11:37:56 +08:00
huili c3b84da1b0
Merge pull request #5080 from taosdata/hotfix/test
[TD-2830]<feature> support tar.gz pkg
2021-01-29 11:36:48 +08:00