Commit Graph

8811 Commits

Author SHA1 Message Date
Steven Li 7a66bf103c Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-09-29 23:17:41 +00:00
Shengliang Guan a64d53313c Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 19:08:42 +08:00
Shengliang Guan 943c618381
Merge pull request #3726 from paopaol/fix/compile-arm
fix cross compile failed in arm32
2020-09-29 19:08:19 +08:00
Shengliang Guan 8679a057b8 Merge remote-tracking branch 'paopaol/fix/compile-arm' into feature/os 2020-09-29 19:05:50 +08:00
Shengliang Guan 64ebb7ac32
Merge pull request #3728 from taosdata/hotfix/test
[TD-1353]
2020-09-29 18:58:30 +08:00
jinzhao f7c06f24ad merge from taos/develop 2020-09-29 16:13:51 +08:00
Hui Li 16ea473ddd [TD-1353] 2020-09-29 15:54:11 +08:00
jinzhao 89779e71c9 fix cross compile failed in arm32 2020-09-29 15:48:40 +08:00
Shengliang Guan ac8bd50830
Merge pull request #3723 from taosdata/hotfix/sangshuduo/fix-chinese-link-mistake-using
hotfix: <doc> fix some chinese link mistake using.
2020-09-29 15:05:42 +08:00
Shengliang Guan a4b7ba9515
Merge pull request #3716 from taosdata/feature/os
Feature/os
2020-09-29 15:05:04 +08:00
Shengliang Guan 7bd9338ef0
Merge pull request #3722 from taosdata/xiaoping/add_test_case
fix queryinterval failure
2020-09-29 14:33:47 +08:00
Shuduo Sang e5b2cac152 hotfix: <doc> fix some chinese link mistake using.
[TD-1638]
2020-09-29 14:29:45 +08:00
Shengliang Guan 4d554b6762 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 14:28:21 +08:00
Shengliang Guan 61e27f7a98 TD-1530 2020-09-29 14:28:02 +08:00
Shengliang Guan 50af70aaab
Merge pull request #3721 from taosdata/feature/TD-1313
[TD-1313]<hotfix>: update TSDBDatabaseMetadata
2020-09-29 14:22:20 +08:00
Ping Xiao 9e35c58a0c Merge branch 'develop' into xiaoping/add_test_case 2020-09-29 14:13:06 +08:00
root d704d08918 fix queryInterval failure 2020-09-29 14:11:34 +08:00
zyyang-taosdata 7beef60c64 [TD-1313]<hotfix>: implement getColumns method in the TSDBDatabaseMetadata and update the next method in DatabaseMetaDataResultSet 2020-09-29 14:04:16 +08:00
Shengliang Guan 5f97a7b400 TD-1530 2020-09-29 13:43:17 +08:00
Shengliang Guan fb0a143da1 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 11:58:39 +08:00
Shengliang Guan 14ba2ffb5b
Merge pull request #3719 from taosdata/feature/http
Feature/http
2020-09-29 11:39:19 +08:00
Shengliang Guan a2a5791b20 Merge remote-tracking branch 'origin/release/s102' into feature/http 2020-09-29 03:21:05 +00:00
Hongze Cheng 2f346de95e Fix TD-1635 2020-09-29 03:16:47 +00:00
Shengliang Guan 9c6a21257b
Merge pull request #3701 from taosdata/coverity_scan
Coverity scan
2020-09-29 11:00:10 +08:00
Shengliang Guan fe1cbc31af
Update tsdbRead.c 2020-09-29 10:39:19 +08:00
Shengliang Guan 531ef740e8 TD-1530 2020-09-29 10:32:00 +08:00
Shengliang Guan b1ac114510 TD-1530 2020-09-29 10:26:50 +08:00
Shengliang Guan c7167010f1
Merge pull request #3714 from taosdata/guanshengliang-patch-3
Update faq-ch.md
2020-09-29 09:46:53 +08:00
Shengliang Guan f9c9699ec9
Update faq-ch.md 2020-09-29 09:46:42 +08:00
Shengliang Guan 3f573a46c8 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-09-29 09:45:09 +08:00
Shengliang Guan c2446494ed TD-1530 2020-09-29 09:44:36 +08:00
Shengliang Guan 8f4400f982 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-29 01:23:18 +00:00
Shengliang Guan 21792262f5 TD-1617 2020-09-29 01:23:14 +00:00
Shengliang Guan 8e8834a582
Merge pull request #3713 from taosdata/guanshengliang-patch-2
Update faq-ch.md
2020-09-29 08:56:40 +08:00
Shengliang Guan 226c826a54
Update faq-ch.md 2020-09-29 08:55:59 +08:00
Shengliang Guan 4778ff4e83
Merge pull request #3712 from taosdata/guanshengliang-patch-1-1
Update administrator-ch.md
2020-09-29 08:51:02 +08:00
Shengliang Guan 66b25f1a3f
Update administrator-ch.md 2020-09-29 08:50:33 +08:00
Shengliang Guan f191236d95
Update administrator-ch.md 2020-09-29 08:49:55 +08:00
Shengliang Guan dcd2eb4bf6
Update administrator-ch.md 2020-09-29 08:46:22 +08:00
yihaoDeng 63feac06b4 TD-1659 2020-09-29 00:37:07 +00:00
Shengliang Guan 4ee5b5bb37
Merge pull request #3710 from taosdata/develop
Merge from develop into coverity scan
2020-09-29 08:15:02 +08:00
Shengliang Guan 283d144d1c TD-1530 2020-09-28 23:57:00 +08:00
Haojun Liao ec0290c94d [td-225] merge develop 2020-09-28 23:06:06 +08:00
Haojun Liao db66a5da57 [td-225] 2020-09-28 22:57:06 +08:00
Shengliang Guan 6dcc58aa64
Merge pull request #3707 from taosdata/feature/os
Feature/os
2020-09-28 22:52:13 +08:00
Shengliang Guan 05687d1eba TD-1530 minor changes 2020-09-28 22:30:34 +08:00
Shengliang Guan ad4ba3a7fd
Merge pull request #3705 from taosdata/hotfix/test
Hotfix/test
2020-09-28 22:21:41 +08:00
Shengliang Guan fed24001bc TD1530 2020-09-28 18:36:10 +08:00
Hui Li 17190c6e3b [del old go demo file] 2020-09-28 17:09:47 +08:00
Hui Li f4900138fe [TD-1502] 2020-09-28 17:09:07 +08:00