Commit Graph

12412 Commits

Author SHA1 Message Date
dapan1121 0be7fe43ca fix bug 2021-01-23 04:25:52 +08:00
yihaoDeng a1b81053e2 handle conflict 2021-01-22 16:40:13 +00:00
Haojun Liao 9dc0bf6c86 [TD-2339]<feature>: interpolation can be applied along with the time window. 2021-01-22 23:14:45 +08:00
haojun Liao 3401452f36
Merge pull request #5004 from taosdata/hotfix/fix_calloc_failed
fix bug when calloc failed
2021-01-22 22:40:15 +08:00
haojun Liao dd87d2fca2
Merge pull request #4994 from taosdata/hotfix/TD-2767
add assert
2021-01-22 22:36:43 +08:00
haojun Liao e1d87d3406
Merge pull request #5006 from taosdata/hotfix/TD-2818
add assert
2021-01-22 22:35:00 +08:00
yihaoDeng 647a679fa0 failed at some case 2021-01-22 13:42:17 +00:00
yihaoDeng 95c618efac Merge branch 'develop' of https://github.com/taosdata/TDengine into dvv 2021-01-22 12:28:10 +00:00
yihaoDeng da00ccd0f1 validate failed 2021-01-22 12:21:21 +00:00
Shengliang Guan ad3b9fb32e
Merge pull request #5007 from taosdata/feature/sim
TD-2820
2021-01-22 19:57:57 +08:00
Shengliang Guan df96fd1b3d compile error 2021-01-22 19:47:25 +08:00
Shengliang Guan 33228ee589 TD-1207 2021-01-22 19:37:17 +08:00
Shengliang Guan d997745d1a Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-22 19:08:55 +08:00
Shengliang Guan a17cfee7a1 Merge remote-tracking branch 'origin/develop' into feature/TD-1925_new 2021-01-22 18:43:36 +08:00
Shengliang Guan 6bf66d5d50 TD-2798 2021-01-22 18:40:24 +08:00
Shengliang Guan 20a7ae5469 TD-2820 2021-01-22 16:26:05 +08:00
dapan1121 3368e49039 add assert 2021-01-22 16:23:23 +08:00
Shengliang Guan b304cd96c0 TD-1207 2021-01-22 16:11:33 +08:00
liuyq-617 0694e69dda test for mail 2021-01-22 15:16:33 +08:00
Hongze Cheng a5ddcb38d4 nothing 2021-01-22 14:13:36 +08:00
Shengliang Guan be1525677e
Merge pull request #4992 from taosdata/feature/sim
Feature/sim
2021-01-22 13:57:27 +08:00
dapan1121 e6b4aaf54a fix bug 2021-01-21 19:34:15 -10:00
dapan1121 861ad5afc8 fix bug 2021-01-21 19:17:17 -10:00
Shengliang Guan de4f402e89 Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-22 11:59:58 +08:00
Shengliang Guan fa7e9bd6d2 TD-1207 2021-01-22 11:59:14 +08:00
Haojun Liao e2efebe9f6 [TD-225] update the function name. 2021-01-22 11:55:29 +08:00
Hongze Cheng 5dd39e7d6e fix sync coredump 2021-01-22 11:44:53 +08:00
huili 5c88bf3ec3
Merge pull request #4999 from taosdata/hotfix/test
[NONE]
2021-01-22 11:29:50 +08:00
Hui Li bf2e874987 [NONE] 2021-01-22 11:28:49 +08:00
Shengliang Guan 2079533b50 Merge from develop 2021-01-22 10:54:02 +08:00
Elias Soong a3bbff7a0e
Merge pull request #4997 from taosdata/docs/Minor-Fix
[TD-2639] <docs>: twa() do not support super table in current version.
2021-01-22 10:44:37 +08:00
Elias Soong dca860f225 [TD-2639] <docs>: twa() do not support super table in current version. 2021-01-22 10:43:42 +08:00
huili 7b5736e78f
Merge pull request #4991 from taosdata/fix/TD-2445
[TD-2445]<fix>: dump toasd process cfgs
2021-01-22 10:26:57 +08:00
huili f5e6e845d8
Merge pull request #4996 from taosdata/hotfix/test
[TD-2792]<fix> for windows usage, remote shutdown also returns - 1 in…
2021-01-22 10:15:17 +08:00
Hui Li 41f00a4924 [TD-2792]<fix> for windows usage, remote shutdown also returns - 1 in windows client 2021-01-22 10:11:40 +08:00
huili e1b13caa42
Merge pull request #4995 from taosdata/hotfix/test
[NONE]
2021-01-22 10:02:54 +08:00
Hui Li bbd045f53e [NONE] 2021-01-22 10:01:52 +08:00
Hongze Cheng 3b0c58848f fix sync coredump 2021-01-22 09:58:50 +08:00
huili 52b135c1be
Merge pull request #4988 from taosdata/feature/TD-2271
Feature/td 2271
2021-01-22 09:19:04 +08:00
dapan1121 5697e1f589 add assert 2021-01-21 15:12:50 -10:00
yihaoDeng 7c008851e1 TD-2850 2021-01-22 00:34:37 +00:00
yihaoDeng 51dc09dbf2 TD-2453 2021-01-21 16:35:48 +00:00
Shengliang Guan 196b3cb988 Merge remote-tracking branch 'origin/develop' into feature/win 2021-01-21 23:21:24 +08:00
Shengliang Guan 856fe02124 Merge remote-tracking branch 'origin/develop' into feature/TD-1925_new 2021-01-21 23:18:08 +08:00
Shengliang Guan 1b91a43498 TD-2798 2021-01-21 23:14:39 +08:00
Shengliang Guan 78b55c698c
Merge pull request #4990 from taosdata/xiaoping/add_test_case
[TD-2635]<test>: add test case
2021-01-21 23:11:22 +08:00
Haojun Liao d50054c732 [TD-2790]<fix>: fix the bug that tableMeta is not updated if parse error occurs. 2021-01-21 22:29:12 +08:00
Elias Soong 31bcde9ad4
Merge pull request #4993 from taosdata/docs/Minor-Fix
[TD-2639] <docs>: remove unessential emphasis.
2021-01-21 22:23:30 +08:00
Shengliang Guan 2191f1eebc Merge remote-tracking branch 'origin/develop' into feature/TD-1925_new 2021-01-21 22:22:31 +08:00
Elias Soong ea64d25ec3 [TD-2639] <docs>: remove unessential emphasis. 2021-01-21 22:22:21 +08:00