Commit Graph

7680 Commits

Author SHA1 Message Date
Haojun Liao dac0a985c2 [td-1213] 2020-08-24 22:50:16 +08:00
Shengliang Guan 512038e9f2
Merge pull request #3212 from taosdata/master
Master
2020-08-24 21:27:00 +08:00
Shengliang Guan 22c55d9696
Merge pull request #3211 from taosdata/feature/os
Feature/os
2020-08-24 21:21:03 +08:00
Shengliang Guan 7a4dc16f73
Merge pull request #3209 from taosdata/master
Master
2020-08-24 21:20:57 +08:00
Shengliang Guan 0ed403dd53 Merge remote-tracking branch 'origin/master' into feature/os 2020-08-24 11:52:22 +00:00
Shengliang Guan 374c05602c
Merge pull request #3208 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-24 19:49:08 +08:00
Shengliang Guan e23a96a03e
Merge pull request #3207 from taosdata/develop
Merge from develop into master
2020-08-24 19:48:52 +08:00
Hui Li c6c3d96cb5 [TD-880] 2020-08-24 18:18:48 +08:00
Hui Li ee5038ea85 [TD-880] 2020-08-24 18:12:43 +08:00
Shengliang Guan 03042a03b6
Merge pull request #3206 from taosdata/release/v2.0.2.0
[update version info]
2020-08-24 17:22:23 +08:00
Hui Li 72a1a4bb46 [update version info] 2020-08-24 16:55:58 +08:00
Shengliang Guan af20a536cd TD-1212 2020-08-24 16:49:37 +08:00
Haojun Liao 5b5edf0026 [td-1010] add check for max interval time range. 2020-08-24 16:13:31 +08:00
Shengliang Guan 82d12eec6a TD-1201 fix compile error in centos 2020-08-24 16:02:49 +08:00
Haojun Liao ba9ef1377d [td-1151] add test cases and fix the found bugs. 2020-08-24 15:36:06 +08:00
Shengliang Guan 5ac0d1376e TD-1212 add replica paras for taosdemo 2020-08-24 07:15:02 +00:00
Hongze Cheng d02d2e3929 fix centos compile error 2020-08-24 11:44:10 +08:00
Shengliang Guan d711657139
Merge pull request #3200 from taosdata/feature/os
TD-1205 add error code to crash_gen.py
2020-08-24 10:52:55 +08:00
Shengliang Guan 852ffa43d1 TD-1205 re-run ci 2020-08-24 10:33:26 +08:00
Shengliang Guan 72352f0367 TD-1205 add error code to crash_gen.py 2020-08-24 10:04:04 +08:00
Shengliang Guan 4dd8793fe4
Merge pull request #3199 from taosdata/liuyq-617-patch-4
Update faq-ch.md
2020-08-24 09:26:24 +08:00
Yiqing Liu 0290613f4c
Update faq-ch.md 2020-08-24 09:21:33 +08:00
Shengliang Guan 3572036abb
Merge pull request #3198 from taosdata/liuyq-617-patch-4
Update faq-ch.md
2020-08-24 09:16:42 +08:00
Shengliang Guan 8e757cf77a
Merge pull request #3197 from taosdata/jtao1735-patch-4
Update cluster-ch.md
2020-08-24 09:16:11 +08:00
Yiqing Liu fa8dd5f480
Update faq-ch.md 2020-08-23 22:40:55 +08:00
Jeff Tao ca35b6dfca
Update cluster-ch.md 2020-08-23 22:27:34 +08:00
Shengliang Guan 460ed644ff
Merge pull request #3179 from taosdata/TD-1174_feature
TD-1174: jdbc without host ip
2020-08-23 20:36:10 +08:00
Shengliang Guan 6c95affeea
Merge pull request #3186 from taosdata/bugfix/td-1127
fix two case of 'unexpected generic error in RPC'
2020-08-23 20:11:22 +08:00
Shengliang Guan 2f76b8c276
Merge pull request #3196 from taosdata/master
Master
2020-08-23 20:11:08 +08:00
Shengliang Guan 396d3aa0ce
Merge pull request #3185 from taosdata/bugfix/td-1189
fix td-1189
2020-08-23 20:08:16 +08:00
Shengliang Guan 310ac98edf
Merge pull request #3192 from taosdata/fmaster/lihui
[TD-1048]
2020-08-23 20:06:38 +08:00
Shengliang Guan 13f90fcf5e
Merge pull request #3195 from taosdata/jtao1735-patch-3
Update cluster-ch.md
2020-08-23 20:04:33 +08:00
Shengliang Guan c5e76c2896
Merge pull request #3194 from taosdata/jtao1735-patch-2
Update administrator-ch.md
2020-08-23 20:04:08 +08:00
Jeff Tao a5702abfc2
Update cluster-ch.md 2020-08-23 19:20:05 +08:00
Jeff Tao 467962e41e
Update administrator-ch.md 2020-08-23 19:16:46 +08:00
Haojun Liao e4e4c7fcd3 [td-1067] 2020-08-22 23:02:12 +08:00
Haojun Liao 51290fd1aa [td-1067] 2020-08-22 19:02:58 +08:00
Haojun Liao 0fc1c8cdb5 [td-837] check mem after malloc 2020-08-22 17:50:12 +08:00
Hui Li c984139ca1 [TD-1196] 2020-08-22 16:41:09 +08:00
Hongze Cheng 1e918b4e1f
Merge pull request #3189 from taosdata/liuyq-617-patch-3
Update insert-ch.md
2020-08-22 16:31:14 +08:00
Hongze Cheng c0197762a7
Merge pull request #3190 from taosdata/jtao1735-patch-1
Update Model-ch.md
2020-08-22 16:19:26 +08:00
Haojun Liao 8ba7387e53 [td-225] refactor codes. 2020-08-22 16:00:22 +08:00
Hui Li 5682851c4e [TD-1048] 2020-08-22 15:46:22 +08:00
Haojun Liao 74fdb1c2aa [td-225] refactor shell code to support ctrl+c. 2020-08-22 13:24:33 +08:00
Haojun Liao f22098b6dd [td-225] refactor shell code. 2020-08-22 12:03:57 +08:00
Haojun Liao b16fa964d7 [td-225] refactor shell code. 2020-08-22 11:59:48 +08:00
Haojun Liao 2ad3133465 [td-225] refactor shell code. 2020-08-22 11:57:13 +08:00
Haojun Liao 3ff538c6cc [td-225] merge develop 2020-08-22 10:52:00 +08:00
Jeff Tao c1c8d1e3f1
Update Model-ch.md 2020-08-22 08:34:38 +08:00
Jeff Tao 0d806426cd
Update Model-ch.md 2020-08-22 08:26:48 +08:00