Commit Graph

7855 Commits

Author SHA1 Message Date
zyyang a43e1a0f2f Merge branch 'td-1356' of github.com:taosdata/TDengine into td-1356 2020-09-08 10:42:34 +08:00
zyyang-taosdata e31f80ed83 update springbootDemo 2020-09-08 10:40:54 +08:00
zyyang-taosdata dee7d93bcc update springbootDemo 2020-09-08 00:13:42 +08:00
Shengliang Guan 0dbef3bc75
Merge pull request #3415 from taosdata/liuyq-617-patch-1
Update faq-ch.md
2020-09-07 19:55:32 +08:00
Shengliang Guan a91f2d5aa9
Merge pull request #3414 from taosdata/feature/query
Feature/query
2020-09-07 19:53:02 +08:00
Yiqing Liu e5b1cb1388
Update faq-ch.md 2020-09-07 19:25:52 +08:00
Haojun Liao 7550b6c595 [td-225] merge develop 2020-09-07 18:49:15 +08:00
Shengliang Guan 87755c5dea
Merge pull request #3411 from taosdata/xiaoping/add_test_case
[TD-1290]<test> add test case for group by
2020-09-07 17:30:10 +08:00
Shengliang Guan 510161671f
Merge pull request #3409 from taosdata/feature/mqtt
Feature/mqtt
2020-09-07 16:00:36 +08:00
Ping Xiao 0f7b3ce040 [TD-1290]<test> add test case for group by 2020-09-07 15:52:41 +08:00
root c413e0d775 Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 15:26:25 +08:00
root 7ec52b6bb5 update scripts 2020-09-07 15:25:01 +08:00
Haojun Liao 93967816ea [td-225] merge develop 2020-09-07 15:22:46 +08:00
root 091271b02d minor changes 2020-09-07 15:12:02 +08:00
Shengliang Guan 5e5750bde3
Merge pull request #3406 from taosdata/feature/mqtt
Feature/mqtt
2020-09-07 15:11:08 +08:00
Haojun Liao 75ddb1ff0c [td-225] fix bugs 2020-09-07 14:57:04 +08:00
Haojun Liao ac43972d38 [td-225] update sim script 2020-09-07 14:56:39 +08:00
Shengliang Guan fb26143c7c
Merge pull request #3407 from taosdata/master
Master
2020-09-07 14:37:38 +08:00
Shengliang Guan 680a288fe0
Merge pull request #3405 from taosdata/release/s101
Release/s101
2020-09-07 13:42:22 +08:00
Shengliang Guan 0412fd543b
Merge pull request #3404 from taosdata/feature/sangshuduo/snap
[TECO-6] <enhance> change fixed version string to placeholder.
2020-09-07 13:30:16 +08:00
Shengliang Guan a5192f5799
Merge pull request #3403 from taosdata/xiaoping/markdowk_update
[TD-1348]<docs>: Java connector markdown file update
2020-09-07 13:30:02 +08:00
Shuduo Sang 1dad79456d 'minor' 2020-09-07 12:56:33 +08:00
Shengliang Guan 9487d607ae compile not pass even in some vs2013 environments 2020-09-07 12:35:34 +08:00
root a1b1b8ab11 scripts 2020-09-07 11:39:58 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Shuduo Sang 61a45a3041 [TECO-6] <docs>: Add snap badge. 2020-09-07 11:20:28 +08:00
Shuduo Sang a723239a38 [TECO-6] <enhance> change fixed version string to placeholder. 2020-09-07 11:03:13 +08:00
Ping Xiao 35db7dee2d [TD-1348]<docs>: Java connector markdown file update 2020-09-07 10:11:32 +08:00
Shengliang Guan 4728075749
Merge pull request #3402 from taosdata/TD-1259
jdbcDemo use the taos-jdbcdriver-2.0.4
2020-09-07 10:09:26 +08:00
yangzhiyu 97e328b239 jdbcDemo use the taos-jdbcdriver-2.0.4 2020-09-06 23:06:34 +08:00
Shengliang Guan 95514381e8
Merge pull request #3394 from taosdata/feature/query
Feature/query
2020-09-06 12:13:27 +08:00
Haojun Liao 8cb141554e [td-225] update sim script 2020-09-05 23:31:53 +08:00
Shengliang Guan 9496282542
Merge pull request #3399 from taosdata/release/s101
[modify script]
2020-09-05 22:57:52 +08:00
Shengliang Guan 22334b1611
Merge pull request #3398 from taosdata/release/s101
[modify script]
2020-09-05 22:56:07 +08:00
Shengliang Guan 5a5a27e8fc minor changes 2020-09-05 09:56:49 +00:00
Shengliang Guan 25c0b8cbe9 [TD-1293 ]<fix>: monitor uses too many resources and may cause auth failure 2020-09-05 09:50:15 +00:00
Hui Li 56c8b5c798 [modify script] 2020-09-05 15:40:32 +08:00
Haojun Liao 401e729961 [td-1333] 2020-09-05 14:53:59 +08:00
Haojun Liao 3a54e379ad [td-1333] 2020-09-05 14:52:15 +08:00
Shengliang Guan f1d6b77720
Merge pull request #3392 from taosdata/hotfix/test
[issue:3375]
2020-09-05 13:51:37 +08:00
Shengliang Guan ecd27d6703
Merge pull request #3391 from taosdata/release/s101
Release/s101
2020-09-05 13:50:21 +08:00
Shengliang Guan a453840c6c
Merge pull request #3388 from taosdata/perftest_update
Add query performance test into daily test
2020-09-05 13:49:22 +08:00
Haojun Liao b98ed27fe4 [td-1315] 2020-09-05 13:27:19 +08:00
Haojun Liao 0f9543994a [td-1315] 2020-09-05 13:24:35 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
Shengliang Guan 59966c953b
Merge pull request #3389 from taosdata/release/s101
Release/s101
2020-09-05 11:25:55 +08:00
Hui Li 563a90f46a update the version 2020-09-05 10:57:38 +08:00
Shengliang Guan 67c96ba449
Merge pull request #3387 from taosdata/improve_test_report
imporove test report
2020-09-05 10:57:20 +08:00
Ping Xiao f8dd744267 TD-1177: Add performance test into daily test 2020-09-05 10:51:16 +08:00
root 189c30345f minor changes 2020-09-05 10:34:19 +08:00