Commit Graph

8746 Commits

Author SHA1 Message Date
Shengliang Guan 3bbbbdf561 Merge remote-tracking branch 'origin/develop' into feature/query 2020-10-13 19:33:23 +08:00
liuyq-617 a4b95b40eb test jenkins 2020-10-13 19:28:34 +08:00
liuyq-617 15a52ccac2 test jenkins 2020-10-13 19:24:26 +08:00
Shengliang Guan d8a239bf59
Merge pull request #3830 from taosdata/zyyang-taosdata-patch-2
Update administrator-ch.md
2020-10-13 19:13:49 +08:00
Shengliang Guan 931ce0a4bb
Merge pull request #3827 from taosdata/hotfix/TD-1688
Hotfix/td 1688
2020-10-13 19:13:17 +08:00
Shengliang Guan b14fd5d572
Merge pull request #3838 from taosdata/hotfix/test
Hotfix/test fix jenkinsfile
2020-10-13 19:12:19 +08:00
liuyq-617 129cfc2ded fix Jenkinsfile 2020-10-13 18:50:14 +08:00
Haojun Liao daea8133ed [td-255] compact result for all show command. 2020-10-13 18:22:07 +08:00
liuyq-617 8f7cac1f0d [TD-1676]fix Jenkinsfile error 2020-10-13 16:46:46 +08:00
liuyq-617 5d4aca0926 [TD-1676] fix Jenkinsfile error 2020-10-13 16:25:48 +08:00
Yiqing Liu 1753013828
Merge pull request #3829 from taosdata/hotfix/test
[TD-1577][TD-1676] jenkins test
2020-10-13 15:42:18 +08:00
Shengliang Guan 74b9d05969
Merge pull request #3828 from taosdata/feature/http
TD-1652
2020-10-13 14:53:56 +08:00
Shengliang Guan f6e26868c5 TD-1652 2020-10-13 14:35:27 +08:00
zyyang 4dbe9badb2
Update administrator-ch.md
2.0中不再叫monitor,或者SYS库了,叫log
2020-10-13 14:05:18 +08:00
liuyq-617 958c7f6d64 [TD-1577][TD-1676] jenkins test 2020-10-13 13:56:42 +08:00
Haojun Liao 49ae6c39e5 [td-225] 2020-10-13 13:26:32 +08:00
Shengliang Guan 757ab26125
Merge pull request #3825 from taosdata/hotfix/test
[TD-1601]
2020-10-13 13:24:15 +08:00
Hui Li 4dccc2fb9d [TD-1601] 2020-10-13 13:23:08 +08:00
Haojun Liao d4a18dd68c [td-225] 2020-10-13 13:14:50 +08:00
Haojun Liao 3caf1ffc04 [td-225] 2020-10-13 11:53:16 +08:00
Haojun Liao 66ab0cd04c [td-225] 2020-10-13 11:47:45 +08:00
Haojun Liao c6479a148a [td-225] merge develop 2020-10-13 11:35:40 +08:00
Haojun Liao 25ee3b480b [td-225] refactor client code 2020-10-13 11:18:11 +08:00
Hui Li 92739569cb [TD-1601] 2020-10-13 10:54:21 +08:00
Shengliang Guan c85c597b97 TD-1652 2020-10-13 10:14:51 +08:00
Shengliang Guan b604ed1370
Merge pull request #3820 from taosdata/boxiaobj-patch-7
Minor format adjustment
2020-10-13 09:47:38 +08:00
Bo Xiao 57199e31c5
Minor format adjustment
Minor format adjustment for indent 4 characters.
2020-10-13 08:42:55 +08:00
yihaoDeng 1e0c3e521f Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-10-12 19:28:31 +00:00
yihaoDeng 2fd7ac5f50 TD-1688 2020-10-12 17:35:43 +00:00
yihaoDeng 61477aa067 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-10-12 17:04:29 +00:00
Shengliang Guan 2566b8baa4
Merge pull request #3798 from taosdata/boxiaobj-patch-6-1
Delete second EP, add maxBinaryDisplayWidth
2020-10-12 22:20:35 +08:00
Shengliang Guan 97d8756582
Merge pull request #3794 from taosdata/patch/TD-1669
TD-1669
2020-10-12 22:17:41 +08:00
Shengliang Guan f079aa7599 Merge remote-tracking branch 'origin/develop' into patch/TD-1669 2020-10-12 12:18:25 +00:00
Shengliang Guan 83f02fe202
Merge pull request #3816 from taosdata/hotfix/test
Hotfix/test
2020-10-12 20:16:33 +08:00
Shengliang Guan 8eb559e6a3
Merge pull request #3817 from taosdata/master
Merge from master into develop
2020-10-12 20:16:06 +08:00
Shengliang Guan 4d30dc9db1 TD-1657 2020-10-12 12:08:19 +00:00
Hui Li 5d64e7ed53 [TD-1625] 2020-10-12 18:43:14 +08:00
Shengliang Guan d08caf9fa5
Merge pull request #3814 from taosdata/release/s103
Release/s103 merge to master
2020-10-12 18:36:43 +08:00
Hui Li 2f9b68a977 [TD-1625] 2020-10-12 18:30:00 +08:00
Hui Li fa874237b2 [TD-1625] 2020-10-12 18:27:43 +08:00
Shengliang Guan 1abffd94be TD-1671 2020-10-12 10:18:16 +00:00
Hui Li f01c0e7630 update the version.inc 2020-10-12 17:57:32 +08:00
Shengliang Guan d8600ae91a
Merge pull request #3810 from taosdata/bugfix/td-1675
[TD-1675]<fix>: #3768: server and client crash when drop a subscribed super table
2020-10-12 17:56:00 +08:00
Shengliang Guan ab05adab4f
Merge pull request #3796 from taosdata/hotfix/TD-1665
TD-1665
2020-10-12 17:55:35 +08:00
Shengliang Guan ccfed462dd TD-1671 2020-10-12 09:10:57 +00:00
Shengliang Guan d477429414 TD-1670 2020-10-12 07:55:41 +00:00
Hongze Cheng 9e8508d2a7 TD-1682 2020-10-12 07:55:08 +00:00
Shengliang Guan afb4aff651 TD-1671 2020-10-12 07:28:35 +00:00
Bomin Zhang ab1ee97122 fix td-1675 2020-10-12 14:56:46 +08:00
Hui Li fec9531bc3 change dockerfile for install package with version 2020-10-12 14:31:20 +08:00