Commit Graph

12473 Commits

Author SHA1 Message Date
haojun Liao b3008458eb
Merge pull request #5146 from taosdata/hjxilinx-patch-4
[TD-2932]
2021-02-06 14:03:18 +08:00
haojun Liao 33db41f423
Merge pull request #5161 from taosdata/hotfix/TD-2926
[TD-2926]client crashes when running crash_gen test
2021-02-06 11:26:54 +08:00
haojun Liao f742705145
Merge pull request #5160 from taosdata/hotfix/TD-2948
[TD-2948]client crashes when building stddev query msg
2021-02-06 11:26:40 +08:00
haojun Liao 91eedf66be
Merge pull request #5158 from taosdata/hotfix/TD-2944
[TD-2944]taosd crashes when executing stddev query
2021-02-06 11:26:19 +08:00
Elias Soong fdb565206e
Merge pull request #5168 from taosdata/docs/Minor-Fix
Fix several minor typo things in docs.
2021-02-05 18:04:23 +08:00
Elias Soong 3e78374249 [TD-2639] <docs>: fix typo in example of alter table tags. 2021-02-05 18:02:58 +08:00
huili 5f4ee37235
Merge pull request #5159 from taosdata/hotfix/sangshuduo/TD-2893-fix-http-error-typo
[TD-2893] <fix>: fix http invalid url error typo.
2021-02-05 17:32:08 +08:00
Shuduo Sang 5610444b2a Merge branch 'develop' into hotfix/sangshuduo/TD-2893-fix-http-error-typo 2021-02-05 09:23:57 +00:00
huili ffb7b03ad5
Merge pull request #5162 from taosdata/test/jenkins
fix
2021-02-05 15:19:28 +08:00
liuyq-617 d24295b779 fix 2021-02-05 15:15:15 +08:00
huili 5bae3d9f2e
Merge pull request #5157 from taosdata/test/jenkins
cancel build excluded regions stategy
2021-02-05 15:06:45 +08:00
haojun Liao 07266ba90b
Merge pull request #5141 from taosdata/hotfix/TD-2518
[TD-2518]support query data before 1970
2021-02-05 14:50:46 +08:00
dapan1121 5de04febe7 fix bug 2021-02-05 14:33:25 +08:00
liuyq-617 5a8382da35 fix 2021-02-05 14:12:04 +08:00
dapan1121 13db0579e0 fix bug 2021-02-05 13:56:37 +08:00
liuyq-617 b2953230c6 fix error 2021-02-05 13:56:34 +08:00
Shengliang Guan 5e060605d8
Merge pull request #5147 from taosdata/feature/linux
Feature/linux
2021-02-05 13:02:53 +08:00
liuyq-617 70b9a07ea3 fix error 2021-02-05 11:52:29 +08:00
liuyq-617 1fc7765dff change 2021-02-05 11:37:17 +08:00
liuyq-617 e61df9d8a0 cancel build excluded regions stategy 2021-02-05 11:32:50 +08:00
liuyq-617 d9c36cbc3c Merge branches 'test/jenkins' and 'develop' of github.com:taosdata/TDengine into develop 2021-02-05 11:32:01 +08:00
liuyq-617 aee811d65b change 2021-02-05 11:28:24 +08:00
liuyq-617 2207ca006b cancel build excluded regions stategy 2021-02-05 11:07:37 +08:00
Shengliang Guan 801c8d632e Merge remote-tracking branch 'origin/develop' into feature/linux 2021-02-05 09:37:08 +08:00
Shengliang Guan 31273a8967 taosd may crash while run m2.sim 2021-02-05 09:34:23 +08:00
dapan1121 fd6f387ec8 fix bug 2021-02-05 09:27:10 +08:00
dapan1121 f526932ad4 fix bug 2021-02-05 09:24:02 +08:00
Shengliang Guan 21d7ba3ef7
Merge pull request #5152 from taosdata/fix/TD-2910
[TD-2910]<fix>: fix onlineDnodes > totalDnodes issue
2021-02-05 00:20:31 +08:00
Minglei Jin 21f423e2cf [TD-2910]<fix>: fix onlineDnodes > totalDnodes issue 2021-02-04 19:47:34 +08:00
huili 3347aa6c84
Merge pull request #5143 from taosdata/hotfix/sangshuduo/TD-2936-change-mac-default-path
[TD-2936] <fix>: change default path to follow mac standard.
2021-02-04 18:43:34 +08:00
huili 368faebfaf
Merge pull request #5151 from taosdata/liuyq-617-patch-1
Update Jenkinsfile
2021-02-04 18:42:52 +08:00
Yiqing Liu 84c7adee52
Update Jenkinsfile 2021-02-04 18:41:49 +08:00
liuyq-617 dfd1e8ce18 revert 2021-02-04 18:34:55 +08:00
haojun Liao 155cbc68d4
Merge pull request #5136 from taosdata/feature/TD-2568
Feature/td 2568
2021-02-04 18:06:34 +08:00
huili aa09e11979
Merge pull request #5140 from taosdata/feature/sangshuduo/TD-2931-add-y-to-skip-prompt
[TD-2931] <feature>: add -y parameter to skip prompt.
2021-02-04 16:31:21 +08:00
huili 07fbb822cb
Merge pull request #5148 from taosdata/hotfix/test
Hotfix/test
2021-02-04 16:30:08 +08:00
Hui Li 467fcba39f [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:29:16 +08:00
Hui Li 8e3df07217 [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:27:13 +08:00
Shengliang Guan 871e24dc20 Merge remote-tracking branch 'origin/develop' into feature/linux 2021-02-04 16:24:40 +08:00
Shengliang Guan 32b10a42d0 TD-1207 rename in windows 2021-02-04 16:23:55 +08:00
Shengliang Guan 7574b98ebf
Merge pull request #5144 from taosdata/fix/TD-2925
[TD-2925]<fix>: rename keep2,keep1 -> keep1,keep0
2021-02-04 16:23:01 +08:00
Shengliang Guan c8ee5d5627
Merge pull request #5145 from taosdata/feature/linux
fix crash while run m2.sim
2021-02-04 16:22:21 +08:00
dapan1121 cfaa9adc58 fix bug 2021-02-04 16:13:55 +08:00
dapan1121 3d1a0e0e67 Merge branch 'develop' into hotfix/TD-2926 2021-02-04 16:13:08 +08:00
haojun Liao 7a3c69c238
[TD-2932]
[TD-2932]<fix>: fix crash during cancel query at client side.
2021-02-04 15:59:51 +08:00
Minglei Jin cc29da4e52 [TD-2643,TD-2925]<fix>: update sim test case and JDBCDemo doc 2021-02-04 15:40:51 +08:00
Shengliang Guan 9db8f7c336 fix crash while run m2.sim 2021-02-04 15:32:50 +08:00
huili 4e2e7596cb
Merge pull request #5102 from taosdata/hotfix/sangshuduo/TD-2901-csharp-taosdemo-with-mono-doesnot-exit
[TD-2901] <fix>: fix bug taosdemo with mono compiled does not exit.
2021-02-04 15:25:59 +08:00
huili efece34933
Merge pull request #5138 from taosdata/xiaoping/add_test_case
Fix taosdemoTest2.py failure
2021-02-04 15:25:15 +08:00
huili fb7b63eed0
Merge pull request #5134 from taosdata/test/testcase
[TD-2555]<test>add test for stddev
2021-02-04 15:25:04 +08:00