Commit Graph

7479 Commits

Author SHA1 Message Date
Shengliang Guan e25766c4f7
Merge pull request #3235 from taosdata/develop
Merge from develop into master
2020-08-26 11:06:24 +08:00
Shengliang Guan 40fe952038
Merge pull request #3231 from taosdata/fmaster/lihui
Fmaster/lihui
2020-08-26 10:02:53 +08:00
Shengliang Guan abe5872114
Merge pull request #3232 from taosdata/feature/sangshuduo/perftest-script-improve
change to v16/v20 instead of master/develop
2020-08-26 09:22:06 +08:00
Shengliang Guan a319dda7e3
Merge pull request #3234 from taosdata/jtao1735-patch-7
Update faq-ch.md
2020-08-26 09:21:31 +08:00
Shengliang Guan 538b4bf471
Merge pull request #3233 from taosdata/jtao1735-patch-6
Update faq-ch.md
2020-08-26 09:21:13 +08:00
Jeff Tao 9efe5fe06a minor changes
:
2020-08-26 00:00:58 +00:00
Jeff Tao 5518b07395
Update faq-ch.md 2020-08-26 06:45:21 +08:00
Jeff Tao 60a1f46bfb
Update faq-ch.md 2020-08-25 22:25:46 +08:00
Shuduo Sang a373658308 change to v16/v20 instead of master/develop 2020-08-25 21:35:15 +08:00
Hui Li fffbef43e3 [TD-1132] 2020-08-25 20:09:06 +08:00
Hui Li 66a977df9c [TD-1132] 2020-08-25 17:43:47 +08:00
Hui Li 2bb07eb03f [TD-1132] 2020-08-25 17:40:27 +08:00
Shengliang Guan 697ae8cb5b
Merge pull request #3230 from taosdata/jtao1735-patch-5
Update faq-ch.md
2020-08-25 17:18:40 +08:00
Jeff Tao 6aefd49630
Update faq-ch.md 2020-08-25 17:17:32 +08:00
Shengliang Guan 2a7f3d6618
Merge pull request #3229 from taosdata/jtao1735-patch-4
Update faq-ch.md
2020-08-25 16:53:08 +08:00
Shengliang Guan 591cd1f297
Merge pull request #3226 from taosdata/master
Master
2020-08-25 16:52:43 +08:00
Shengliang Guan 8dbbfd7077
Merge pull request #3227 from taosdata/hotfix/connrelease
[td-1227]
2020-08-25 16:52:21 +08:00
Jeff Tao 308998cd22
Update faq-ch.md 2020-08-25 16:50:45 +08:00
Shengliang Guan cf1cfc9a40 Merge branch 'master' of https://github.com/taosdata/TDengine 2020-08-25 16:11:38 +08:00
Haojun Liao dffb6511e5 [td-1227] 2020-08-25 16:04:00 +08:00
Shengliang Guan 7c39b573a3
Merge pull request #3220 from taosdata/fmaster/lihui
[TD-1203]
2020-08-25 16:00:27 +08:00
Shengliang Guan dc393618f3
Merge pull request #3223 from taosdata/hotfix/test
[TD-1203]
2020-08-25 15:59:54 +08:00
Hui Li 6cca3cdcb9 [TD-1121] 2020-08-25 15:00:40 +08:00
Hui Li 24d33d0243 [TD-1203] 2020-08-25 14:56:43 +08:00
Hui Li b3b3108e5b [TD-1203] 2020-08-25 14:53:10 +08:00
Hui Li 50b51f1500 [TD-1203] 2020-08-25 14:31:15 +08:00
Hui Li 37da0e660f [TD-1203] 2020-08-25 14:13:02 +08:00
Hui Li a8417e7b6e [TD-1203] 2020-08-25 13:48:32 +08:00
Shengliang Guan c43cca3cb4 minor changes 2020-08-25 11:35:56 +08:00
Shengliang Guan b8896c3657
Merge pull request #3213 from taosdata/hotfix/os
Hotfix/os
2020-08-24 23:38:16 +08:00
Shengliang Guan d8b4195a4f
Merge pull request #3214 from taosdata/liuyq-617-patch-4
Update faq-ch.md
2020-08-24 23:25:29 +08:00
Yiqing Liu 69ebb401de
Update faq-ch.md
add new faq about JDBC
2020-08-24 23:18:57 +08:00
Shengliang Guan 3fb64ca0e2 minor changes 2020-08-24 15:11:29 +00:00
Shengliang Guan 99715c7b52 TD-1217 let monitor database can be dropped 2020-08-24 15:06:47 +00:00
Shengliang Guan 1b3e5d0f0c TD-1216 update normal table uid 2020-08-24 15:03:19 +00: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
Shengliang Guan 82d12eec6a TD-1201 fix compile error in centos 2020-08-24 16:02:49 +08:00
Shengliang Guan 5ac0d1376e TD-1212 add replica paras for taosdemo 2020-08-24 07:15:02 +00: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