Commit Graph

8740 Commits

Author SHA1 Message Date
Shengliang Guan 496f297f75 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-27 09:49:40 +00:00
Shengliang Guan d08432ea67
Merge pull request #3690 from taosdata/feature/ad
Feature/ad
2020-09-27 17:48:49 +08:00
Shengliang Guan 19947311de
Merge pull request #3691 from taosdata/feature/crash
Invalid Write in the Sync module
2020-09-27 17:48:23 +08:00
Haojun Liao c63ec824f3 [td-1603] add new error code at client side 2020-09-27 15:44:02 +08:00
Shengliang Guan 16969d0d88 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-27 07:12:22 +00:00
Haojun Liao 100121251f [td-1619] 2020-09-27 15:11:46 +08:00
Haojun Liao 38c6df299f Merge remote-tracking branch 'origin/release/s102' into release/s102 2020-09-27 15:01:22 +08:00
Haojun Liao 9c7aecc3d0 [td-1619] 2020-09-27 15:00:35 +08:00
Shengliang Guan f82c9afcbc hotfix for invalid table id 2020-09-27 06:41:22 +00:00
Ping Xiao 2568e38438 Merge branch 'develop' into coverity_scan 2020-09-27 14:32:22 +08:00
Shengliang Guan 2f5ed602fe Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-27 06:04:54 +00:00
Shengliang Guan 49713d77ce
Merge pull request #3689 from taosdata/hotfix/test
[TD-1465]
2020-09-27 14:04:16 +08:00
Shengliang Guan fae16c3cef
Merge pull request #3686 from taosdata/hotfix/TD-1608
[TD-1608]<hotfix>: fix bugs in jdbc parse url
2020-09-27 14:03:57 +08:00
Shengliang Guan 456f65575a TD-1571 2020-09-27 05:55:25 +00:00
Hui Li 1f4d0b0c13 [TD-1465] 2020-09-27 13:28:37 +08:00
Shengliang Guan a1912ef83f TD-1415 2020-09-27 05:25:15 +00:00
zyyang 9dbc9b6fd8 [TD-1608]<hotfix>: fix bugs in jdbc parse url 2020-09-27 09:14:43 +08:00
Shengliang Guan 4736c6621d TD-1418 2020-09-25 16:26:16 +00:00
Shengliang Guan ca3fbb10ed
Merge pull request #3683 from taosdata/feature/ad
Feature/ad
2020-09-25 23:01:40 +08:00
Shengliang Guan babe8f158c
Merge pull request #3682 from taosdata/feature/TD-1572
update jdbc taosdemo
2020-09-25 22:46:28 +08:00
Shengliang Guan 786f3256f2 minor changes 2020-09-25 14:45:21 +00:00
Shengliang Guan 4f3e8f404c Merge branch 'feature/ad' of https://github.com/taosdata/TDengine into feature/ad 2020-09-25 14:43:18 +00:00
Shengliang Guan f2dafd9c72 TD-1473 2020-09-25 14:42:56 +00:00
Shengliang Guan 7a840d7f2a change maxVgroupsPerDb to 16 2020-09-25 10:14:20 +00:00
zyyang 1a4746d425 update jdbc taosdemo 2020-09-25 17:12:15 +08:00
Shengliang Guan 8e75b9e0be
Merge pull request #3679 from taosdata/feature/TD-1572
update JdbcTaosdemo
2020-09-25 15:55:39 +08:00
Shengliang Guan b9006a2ef6
Merge pull request #3677 from taosdata/feature/ad
Feature/ad
2020-09-25 15:55:28 +08:00
Haojun Liao 284e159361 [td-1603] 2020-09-25 15:53:43 +08:00
Haojun Liao 9cb7efeec1 [td-1603] 2020-09-25 15:41:14 +08:00
Shengliang Guan 2cd68ffe69 TD-1574 compile in windows 2020-09-25 15:40:17 +08:00
zyyang 56c8889ee4 update JdbcTaosdemo 2020-09-25 15:39:21 +08:00
Haojun Liao b2dd094ffa [td-1603] 2020-09-25 15:13:33 +08:00
Shengliang Guan 5ec266098f minor changes 2020-09-25 07:10:07 +00:00
Shengliang Guan 2f7cf2b02b Merge remote-tracking branch 'origin/develop' into feature/ad 2020-09-25 07:09:19 +00:00
Shengliang Guan 7533e3bcd1
Merge pull request #3675 from taosdata/feature/http
Feature/http
2020-09-25 15:08:12 +08:00
Shengliang Guan 9431641ff1 minor changes 2020-09-25 07:05:49 +00:00
Haojun Liao 0dcef5b340 [td-1603] 2020-09-25 15:04:47 +08:00
Shengliang Guan 8f0e016fdc Merge remote-tracking branch 'origin/develop' into feature/http 2020-09-25 14:38:10 +08:00
Shengliang Guan d3d4691c94 TD-1550 2020-09-25 14:36:20 +08:00
Haojun Liao df32088b5d [td-1604]. 2020-09-25 14:30:08 +08:00
Haojun Liao a5f68b0ff8 [td-1604]. 2020-09-25 14:22:49 +08:00
Shengliang Guan 5bac6877a8
Merge pull request #3672 from taosdata/feature/examples
python example support custom IP
2020-09-25 14:19:48 +08:00
Haojun Liao 8195149c72 [td-225]. 2020-09-25 14:12:39 +08:00
Haojun Liao 901803abe6 [td-1604] 2020-09-25 14:11:38 +08:00
liuyq-617 c35887815b Support custom IP 2020-09-25 11:47:26 +08:00
Shengliang Guan 07709c3c0f
Merge pull request #3669 from elvizlai/develop
typo: fix chinese semicolon
2020-09-25 11:09:16 +08:00
Shengliang Guan fd3ebebc71
Merge pull request #3660 from taosdata/feature/TD-1572
[TD-1572]<feature>: A JdbcTaosdemo is supported now.
2020-09-25 11:08:36 +08:00
Shengliang Guan e9973578fd
Merge pull request #3668 from taosdata/bugfix/td-1488
[td-1488]<fix>: 'Table does not exist' error when updating metadata between two clients
2020-09-25 11:08:21 +08:00
Shengliang Guan e886b4a477
Merge pull request #3671 from taosdata/hotfix/test
[TD-1504]
2020-09-25 11:06:13 +08:00
Hui Li e74edd3d04 [TD-1504] 2020-09-25 10:34:49 +08:00