Commit Graph

7882 Commits

Author SHA1 Message Date
Shengliang Guan f3217b9706 minor changes 2020-09-08 09:13:17 +00:00
Shengliang Guan a098ad9c33 Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-08 15:57:31 +08:00
Shengliang Guan 227e8f37ab TD-1244 2020-09-08 15:56:47 +08:00
Shengliang Guan bafad31882 TD-1263 compile in windows 2020-09-08 15:18:16 +08:00
Shengliang Guan ed008d5164
Merge pull request #3429 from taosdata/guanshengliang-patch-1
Update administrator-ch.md
2020-09-08 15:08:45 +08:00
Shengliang Guan b6481d2a0d
Merge pull request #3428 from taosdata/xiaoping/add_test_case
[TD-1320]<test> add test case - insert data with tag specified
2020-09-08 15:08:29 +08:00
Shengliang Guan a782d1bec0
Update administrator-ch.md 2020-09-08 14:40:15 +08:00
Ping Xiao d04400f558 [TD-1320]<test> add test case - insert data with tag specified 2020-09-08 14:38:40 +08:00
Shengliang Guan 159f59a15e TD-1263 2020-09-08 06:35:07 +00:00
Shengliang Guan dab6292b98 Merge remote-tracking branch 'origin/develop' into feature/crash 2020-09-08 06:28:40 +00:00
Shengliang Guan f65e360976 TD-1263 2020-09-08 06:27:11 +00:00
Shengliang Guan a472bca9ef
Merge pull request #3426 from taosdata/todevelop
Master
2020-09-08 12:33:36 +08:00
Shengliang Guan d32e926ee7
Merge pull request #3425 from taosdata/td-1356
Td 1356
2020-09-08 12:31:56 +08:00
Shengliang Guan 37922f299f TD-1263 2020-09-08 04:27:55 +00:00
Shengliang Guan 5bafd2a6f7
Merge branch 'develop' into todevelop 2020-09-08 10:57:47 +08:00
Shengliang Guan 2368b35cec
Merge pull request #3422 from taosdata/hotfix/TD-1362
fix TD-1362
2020-09-08 10:53:44 +08:00
Shengliang Guan ca493df61d
Merge pull request #3421 from taosdata/hotfix/retention_problem
fix TD-1362
2020-09-08 10:51:33 +08:00
Shengliang Guan 1f3af47cb1
Merge pull request #3420 from taosdata/bugfix/td-1299
[TD-1299]<fix>: crash when not using default tag order (github #3309)
2020-09-08 10:51:15 +08:00
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
Hongze Cheng ab039d7d06 fix TD-1362 2020-09-08 10:19:36 +08:00
Shengliang Guan 8c12041e53
Merge pull request #3418 from taosdata/hotfix/binlength
[td-225] fix bug while the content in binary column equals to the max…
2020-09-08 10:06:31 +08:00
Hongze Cheng f7d2e7d905 fix TD-1362 2020-09-08 10:00:08 +08:00
Bomin Zhang b78011e858 fix td-1299 (github #3309) 2020-09-08 09:49:27 +08:00
zyyang-taosdata dee7d93bcc update springbootDemo 2020-09-08 00:13:42 +08:00
Haojun Liao 1f2d5f9ee8 [td-225] fix bug while the content in binary column equals to the maximum allowed length 2020-09-08 00:08:18 +08:00
Shengliang Guan e69fbd54a2 [TD-1263] add config items, logKeepDays and logbakDir 2020-09-07 14:35:56 +00:00
Shengliang Guan e5adfe5144
Merge pull request #3417 from taosdata/feature/mqtt
Feature/mqtt
2020-09-07 21:55:29 +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
Shengliang Guan 93f007712a TD-1336 2020-09-07 11:50:36 +00: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 59e9f7d57b TD-1293 update log 2020-09-07 10:47:36 +00: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