xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
8,712 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

8712 Commits

Author SHA1 Message Date
Jeff Tao 85020a59a5 Merge branch 'patch/TD-1632' of https://github.com/taosdata/TDengine into patch/TD-1632 2020-10-07 02:01:30 +00:00
Jeff Tao 756aa48077 TD-1632 2020-10-07 02:00:38 +00:00
Shengliang Guan c87e34062c
Merge pull request #3745 from taosdata/patch/TD-1632 
TD-1632 revert
 2020-10-07 09:39:03 +08:00
Shengliang Guan 1e84441b7b Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-10-06 21:00:36 +08:00
Shengliang Guan 17e0f46d7e
Merge pull request #3752 from taosdata/patch/TD-1645 
TD-1645
 2020-10-06 20:59:04 +08:00
Jeff Tao 62fe32678f Merge branch 'patch/TD-1632' of https://github.com/taosdata/TDengine into patch/TD-1632 2020-10-06 11:47:16 +00:00
Jeff Tao 12687355c0 TD-1632 2020-10-06 11:46:33 +00:00
Jeff Tao 7367b31275 TD-1645 2020-10-06 06:20:07 +00:00
Shengliang Guan ae54c3caeb Merge branch 'develop' into feature/crash_gen 2020-10-06 11:40:06 +08:00
Shengliang Guan 51b90a2e61
Merge pull request #3746 from goldeagle/doc/fix-plugin-install-with-cmake 
upd: README.md with submodule contents of go & grafana connectors
 2020-10-05 22:00:03 +08:00
Shengliang Guan 09838cfdd8 Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-10-05 21:53:58 +08:00
Shengliang Guan 5621f48f06
Merge pull request #3744 from taosdata/patch/TD-1645 
remove a race condition in TCP socket
 2020-10-05 21:52:06 +08:00
Jeff Tao c608fba88e TD-1645 2020-10-03 04:30:02 +00:00
Bison 'goldeagle' Fan 09d2c5c31b upd: README.md with submodule contents of go & grafana connectors 2020-10-03 10:57:24 +08:00
Jeff Tao a8b8ecb20e TD-1645 2020-10-02 14:56:54 +00:00
slguan 97a50f1791 Merge remote-tracking branch 'origin/develop' into patch/TD-1632 2020-10-02 13:44:46 +08:00
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