Commit Graph

8746 Commits

Author SHA1 Message Date
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
Shengliang Guan dec6288006 TD-1530 2020-09-28 07:59:35 +00:00
Shengliang Guan 48a08cae80
Merge pull request #3702 from taosdata/boxiaobj-patch-1
Add alter user privilledge in Document
2020-09-28 15:36:46 +08:00
Shengliang Guan 3b724adeb3 TD-1530 2020-09-28 07:26:39 +00:00
Shengliang Guan e32e507e1f TD-1530 2020-09-28 14:29:23 +08:00
Shengliang Guan ca028a3d17 TD-1530 2020-09-28 04:20:40 +00:00
Shengliang Guan 6a1825905b minor changes 2020-09-28 03:22:31 +00:00
Bo Xiao ac004dc40a
Add alter user privilledge in Document
add alter user privilledge
2020-09-28 11:19:32 +08:00
Shengliang Guan 077c8ff412 TD-1530 2020-09-28 02:55:59 +00:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Haojun Liao 26e708bc0b [td-1300] 2020-09-28 10:17:53 +08:00
Shengliang Guan cb3785d795 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-28 00:39:48 +00:00
Shengliang Guan 25b52351a6
Merge pull request #3700 from taosdata/develop
Merge pull request #3699 from taosdata/feature/http
2020-09-28 08:19:44 +08:00
Steven Li 664b9bff3a Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-09-27 23:43:09 +00:00
Shengliang Guan 72cef1d81d
Merge pull request #3699 from taosdata/feature/http
Feature/http
2020-09-28 00:04:08 +08:00
Shengliang Guan 2b82cfd2b9
Merge pull request #3698 from taosdata/feature/http
TD-1617
2020-09-27 23:36:06 +08:00