Commit Graph

8746 Commits

Author SHA1 Message Date
slguan 8c8f090167 Merge remote-tracking branch 'origin/develop' into patch/TD-1645 2020-10-02 13:42:17 +08:00
Shengliang Guan c522e902fa scripts 2020-10-02 05:40:37 +00:00
Shengliang Guan 38dc4f4d16 TD-1645 fix compile error in windotws 2020-10-02 13:31:15 +08:00
slguan baf580ee8b TD-1632 revert 2020-10-02 12:59:15 +08:00
Shengliang Guan aa6ff1f5dc Merge remote-tracking branch 'origin/develop' into patch/TD-1645 2020-10-02 12:54:48 +08:00
Shengliang Guan 4c08250249
Merge pull request #3708 from taosdata/feature/query
Feature/query
2020-10-02 12:48:21 +08:00
Haojun Liao ef1dc64667 [td-225] fix compiler error on windows 2020-10-02 11:12:46 +08:00
Haojun Liao b3574f294f Merge remote-tracking branch 'origin/feature/query' into feature/query 2020-10-02 11:12:13 +08:00
Haojun Liao 8fed6ecaa1 [td-225] fix compiler error on windows 2020-10-02 11:11:07 +08:00
Shengliang Guan 60688a0365
Merge pull request #3743 from taosdata/develop
Merge from develop
2020-10-02 08:50:28 +08:00
Shengliang Guan ccc32feb22 revert from TD-1632 2020-10-02 08:44:33 +08:00
Shengliang Guan c3f940cb71
Merge pull request #3741 from taosdata/patch/TD-1632
TD-1632
2020-10-02 08:28:38 +08:00
Jeff Tao f949b732f5 TD-1645 2020-10-01 14:55:00 +00:00
Jeff Tao 30284cbe59 TD-1645 2020-10-01 14:48:10 +00:00
Jeff Tao 0e5cc6e46a TD-1645 2020-10-01 14:40:56 +00:00
Haojun Liao 7bf8c4489d [td-225] fix invalid read of hb 2020-10-01 15:36:13 +08:00
Steven Li 61eab1410d Merge remote-tracking branch 'origin/develop' into feature/crash_gen 2020-09-30 19:40:29 +00:00
Haojun Liao 1f0f57cf38 [td-1283] 2020-09-30 23:50:46 +08:00
Haojun Liao a3a95b60c3 [td-1603] add client side defined error code. 2020-09-30 21:58:05 +08:00
Shengliang Guan 87046ff6f7 Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-09-30 17:34:59 +08:00
Shengliang Guan f923cf5f9b
Merge pull request #3735 from taosdata/feature/os
Feature/os
2020-09-30 16:30:37 +08:00
Xiaxin Li 1b0b9f8280
Merge pull request #3739 from taosdata/hostfix/test
Hostfix/test
2020-09-30 16:22:06 +08:00
Shengliang Guan 8bfb3587d3
Merge pull request #3738 from taosdata/xiaoping/markdown_update
update markdown for ALTER USER PRIVILEGE
2020-09-30 15:32:01 +08:00
Shengliang Guan 6437b7fac5 TD-1530 2020-09-30 15:30:31 +08:00
Ping Xiao d442e2b43c update markdown for ALTER USER PRIVILEGE 2020-09-30 15:26:10 +08:00
Yiqing Liu ff406d578a create jenkinfiles 2020-09-30 15:24:22 +08:00
Shengliang Guan 18a937de54 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-30 04:18:05 +00:00
Shengliang Guan a2a4680b16 Merge branch 'feature/os' of https://github.com/taosdata/TDengine into feature/os 2020-09-30 12:16:40 +08:00
Shengliang Guan 70e97fec8a minor changes 2020-09-30 12:15:14 +08:00
Shengliang Guan 4b9a1813a5 minor changs 2020-09-30 04:12:13 +00:00
Shengliang Guan c9152cb35f minor changes 2020-09-30 04:08:11 +00:00
Hongze Cheng d8991f1913 fix TD-1640 2020-09-30 11:02:52 +08:00
Jeff Tao 2d5f36851a TD-1632 2020-09-30 01:21:22 +00:00
Shengliang Guan d09cc3be8a
Merge pull request #3734 from taosdata/patch/TD-1628
TD-1628
2020-09-30 08:51:11 +08:00
Jeff Tao 85e87e02a7 TD-1628 2020-09-30 00:19:17 +00:00
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