Commit Graph

16167 Commits

Author SHA1 Message Date
Shengliang Guan 5bf9a2e49f Merge remote-tracking branch 'origin/feature/m2d' into feature/m2d3 2021-06-22 14:53:45 +08:00
Shengliang Guan 5fa02912f2 Merge from master 2021-06-22 14:53:38 +08:00
Shengliang Guan 209a831b5d Merge remote-tracking branch 'origin/hotfix/tmq' into feature/m2d3 2021-06-22 14:51:31 +08:00
Haojun Liao 86f935d4b0 [td-225] 2021-06-22 14:48:21 +08:00
Shengliang Guan 25ec36ddd6 [TD-4835] change c++ std option 2021-06-22 14:47:52 +08:00
Shengliang Guan c6f5a6c4cf minor changes 2021-06-22 14:42:00 +08:00
Shengliang Guan 2f4da22b11 minor changes 2021-06-22 14:31:15 +08:00
Shengliang Guan ef8cffc1b8 logfile name for tmq 2021-06-22 14:26:12 +08:00
Shengliang Guan dee6657cb8
Merge pull request #6565 from taosdata/release/ver-2.1.3.0
Release/ver 2.1.3.0
2021-06-22 14:19:20 +08:00
Shengliang Guan ea329797bd
Merge pull request #6566 from taosdata/release/ver-2.0.20.8
change version number
2021-06-22 14:18:39 +08:00
tickduan f2fce02bc0 Merge branch 'develop' into compress_float 2021-06-22 14:11:45 +08:00
tickduan 93154cfbd8 add taospack 2021-06-22 14:10:45 +08:00
Shengliang Guan bf24cb469b
Merge pull request #6564 from taosdata/fix/TD-4787
[TD-4787]<fix>: reconnect arbitrator if link broken
2021-06-22 09:46:08 +08:00
yihaoDeng ad651eff54 [TD-4098]<feature> refactor IN filter 2021-06-22 09:29:03 +08:00
yihaoDeng b533fb04d6 [TD-4098]<feature> refactor IN filter 2021-06-22 08:48:44 +08:00
yihaoDeng 41c7b062bb [TD-4098]<feature> refactor IN filter 2021-06-22 08:29:58 +08:00
yihaoDeng 6a95d859e9 [TD-4827]<fix> 2021-06-21 21:04:55 +08:00
Haojun Liao 2eb86a90ac [td-225]merge developpp 2021-06-21 18:55:48 +08:00
zyyang-taosdata 1b6c658a25 change snap version 2021-06-21 18:07:55 +08:00
zyyang-taosdata 207481330e change version number 2021-06-21 17:55:32 +08:00
Haojun Liao 1dd0c56d87 [td-225]fix compiler error. 2021-06-21 17:44:09 +08:00
Elias Soong e53055b358 [TD-4807] <docs>: fix typos. 2021-06-21 17:43:34 +08:00
Minglei Jin 25686cc55b [TD-4787]<fix>: reconnect arbitrator if link broken 2021-06-21 17:03:46 +08:00
Elias Soong b7fded8b4f
Merge pull request #6561 from taosdata/docs/xiaolei/TD-4437-matlab_doc_update
[TD-4437]<docs>:update matlab-jdbc doc
2021-06-21 16:47:21 +08:00
Elias Soong 2c3376649e
Made some little format changes. 2021-06-21 16:45:13 +08:00
zyyang-taosdata a2f84ae93c change version number 2021-06-21 16:34:42 +08:00
Zhiyu Yang 0edce4c096
[TD-4762]<feature>: use maven-assembly-plugins to package multi packages for jdbc demo (#6539)
* [TD-4762]<feature>: use maven-assembly-plugin package multi package for this demo

* change
2021-06-21 16:26:12 +08:00
Haojun Liao 5a9dbf41d4 [td-225]fix compiler error. 2021-06-21 15:46:15 +08:00
zhaoyanggh 4239fd33c6 [TD-4746] add test case for irregular locale setting for java 2021-06-21 15:41:45 +08:00
Haojun Liao a50438f164
Merge pull request #6526 from taosdata/fix/TD-4740
Fix/td 4740
2021-06-21 15:31:39 +08:00
Haojun Liao ceb2aa726b
Merge pull request #6510 from taosdata/origin/feature/TD-3086
[TD-3085] tags support timestamp
2021-06-21 15:30:19 +08:00
xialei_li 129b541bc1 [TD-4437]<docs>:update matlab-jdbc doc 2021-06-21 14:17:48 +08:00
Shengliang Guan 1af6c53986
Merge pull request #6516 from taosdata/fix/TD-4672
[TD-4672]<fix>: remove peer fqdn IP caching
2021-06-21 11:40:17 +08:00
Haojun Liao 5afd77489b [td-225]fix compiler error. 2021-06-21 11:28:48 +08:00
Linhe Huo 1ecdcf8e45
[TD-4803]<doc>: fix repo name in python connector README (#6559) 2021-06-21 11:24:52 +08:00
Yang Zhao 349e14a73f
Update TimestampPrecisionInNanoInJniTest.java 2021-06-21 10:59:45 +08:00
Haojun Liao a37da4e731 [td-4776]<fix>:update the error message. 2021-06-21 10:37:59 +08:00
zhaoyanggh 9b4f437d49 [fix] add jdbc nano second test cases 2021-06-21 10:27:38 +08:00
Haojun Liao 3dc8eca014 [td-4754] 2021-06-21 10:18:05 +08:00
zhaoyanggh 40cb2f55bb change performance test tool to optimize write test 2021-06-21 10:13:27 +08:00
Hui Li d78fea6d2c
Merge pull request #6545 from taosdata/test/TD-4652
Test/td 4751
2021-06-21 10:05:45 +08:00
Hui Li 1bc6382f96
Merge pull request #6550 from taosdata/test/TD-4773
[TD-4773]<test>add test for binary insert
2021-06-21 09:59:31 +08:00
wpan 1a458d66db fix bug 2021-06-21 09:45:26 +08:00
wpan 7b2a126530 fix bug 2021-06-21 09:41:22 +08:00
wpan e73ddd1e6f fix bug for disk full 2021-06-21 09:23:13 +08:00
yihaoDeng c1cd4079db [TD-4734]<feature> session_window and state window support main query 2021-06-21 00:24:46 +08:00
yihaoDeng 65eeca1964 [TD-4734]<feature> session_window and state window support main query 2021-06-20 21:51:15 +08:00
Elias Soong 02f511bbc8
Merge pull request #6554 from taosdata/docs/Update-Latest-Feature
Docs/update latest feature
2021-06-20 09:23:18 +08:00
liuyq-617 c271e5f2a1 [TD-4773]<test>add test for binary insert 2021-06-19 11:32:54 +00:00
tomchon 7d6f3b5b28 Merge branch 'develop' of github.com:taosdata/TDengine into dev/chr 2021-06-19 17:32:43 +08:00