Commit Graph

11528 Commits

Author SHA1 Message Date
Shengliang Guan 4b720b383a Merge remote-tracking branch 'origin/develop' into feature/os 2021-01-21 09:07:56 +08:00
Elias Soong ce781f5175
Merge pull request #4971 from taosdata/docs/Minor-Fix
[TD-2639] <docs>: fix indent of doc.
2021-01-20 22:13:09 +08:00
Elias Soong 6818587a5a [TD-2639] <docs>: fix indent of doc. 2021-01-20 22:09:21 +08:00
huili 7fce3a91d3
Merge pull request #4964 from taosdata/xiaoping/add_test_case
[TD-2720][TD-2247][TD-1024]<test>: add test case
2021-01-20 15:49:52 +08:00
Elias Soong 0ef98f9b98
Merge pull request #4952 from taosdata/docs/Minor-Fix
Fix description about VNode mem cache.
2021-01-20 15:29:00 +08:00
huili 1025e5468c
Merge pull request #4967 from taosdata/zyyang-taosdata-patch-3-2
Update connector-java-ch.md
2021-01-20 15:27:36 +08:00
Elias Soong 4b4367e4e2 [TD-2639] <docs>: fix escape code type error. 2021-01-20 15:26:34 +08:00
zyyang d973966747
Update connector-java-ch.md 2021-01-20 15:25:12 +08:00
Ping Xiao 789fc75428 Merge branch 'develop' into xiaoping/add_test_case 2021-01-20 15:20:38 +08:00
Ping Xiao c1ddf46e93 [TD-1024]<test>: add test case 2021-01-20 15:06:14 +08:00
haojun Liao 99073f1da5
Merge pull request #4959 from taosdata/hotfix/TD-2795
[TD-2795]taosd crash when executing interval query
2021-01-20 13:53:34 +08:00
huili d2e9f8f128
Merge pull request #4941 from taosdata/hotfix/sangshuduo/TD-2799-two-telemetryReporting-options
[TD-2788] <fix>: fix two telemetryReporting options in taos.cfg.
2021-01-20 11:10:28 +08:00
huili f58768104f
Merge pull request #4950 from taosdata/docs/sangshuduo/TD-2775-update-faq
[TD-2775] <docs>: update faq regarding UPDATE parameter.
2021-01-20 11:08:28 +08:00
huili cf8230acf8
Merge pull request #4954 from taosdata/test/testcase
[TD-2784]<test>test pr from forked repo
2021-01-20 11:08:10 +08:00
huili 32c39b1006
Merge pull request #4943 from taosdata/test/jenkins
[TD-2741][TD-2736]<test>add timeout in jenkins
2021-01-20 11:07:10 +08:00
huili ee5d9b2498
Merge pull request #4947 from taosdata/hotfix/sangshuduo/TD-2769-nodejs-12+-adapt
Hotfix/sangshuduo/td 2769 nodejs 12+ adapt
2021-01-20 11:06:55 +08:00
huili 2b7e6d975f
Merge pull request #4955 from taosdata/feature/TD-2776
Feature/td 2776
2021-01-20 11:06:23 +08:00
Elias Soong 0a8b339640 [TD-2639] <docs>: remove one misplaced doc. 2021-01-20 09:55:38 +08:00
Shengliang Guan 404674b563 Merge remote-tracking branch 'origin/develop' into feature/os 2021-01-20 09:44:14 +08:00
Shengliang Guan fffe865871 TD-1207 2021-01-20 09:40:47 +08:00
dapan1121 e0a5ae459c fix bug 2021-01-19 15:23:43 -10:00
haojun Liao c20d574160
Merge pull request #4938 from taosdata/feature/TD-2671
[TD-2671]<fix>:support create/drop/alter stable
2021-01-19 22:27:41 +08:00
haojun Liao 20f2762446
Merge pull request #4921 from taosdata/hotfix/TD-2719
[TD-2719]trace subquery states
2021-01-19 22:22:50 +08:00
zyyang 745f421fea change 2021-01-19 19:18:50 +08:00
zyyang cd426de0b3 change 2021-01-19 19:16:22 +08:00
zyyang fe6cebe309 change 2021-01-19 19:13:44 +08:00
zyyang 7834d641ed change 2021-01-19 19:12:15 +08:00
zyyang 8439fca9f5 change 2021-01-19 19:11:27 +08:00
zyyang b14692e5a5 change 2021-01-19 19:04:48 +08:00
zyyang 19d77697d7 change 2021-01-19 19:02:36 +08:00
zyyang f9a9b0dadc change 2021-01-19 18:58:36 +08:00
zyyang 3a08890e24 change 2021-01-19 18:55:52 +08:00
Ping Xiao 9a8d4c9f4c [TD-2720][TD-2247]<test>: add test case 2021-01-19 18:27:41 +08:00
zyyang 4e2adfe6d2 change 2021-01-19 17:03:38 +08:00
zyyang 03c3cc0f3e change 2021-01-19 16:53:48 +08:00
zyyang 073bb17a10 change 2021-01-19 16:42:05 +08:00
zyyang fb908bc8b0 change 2021-01-19 16:40:02 +08:00
zyyang 9ec1da5f24 change 2021-01-19 16:38:16 +08:00
zyyang 74eb320337 change 2021-01-19 16:32:12 +08:00
zyyang 16530a22eb change 2021-01-19 16:22:13 +08:00
Shengliang Guan 1cfc236b35 Merge from develop 2021-01-19 15:41:57 +08:00
Shengliang Guan d0534df8c0 TD-1207 2021-01-19 15:26:44 +08:00
liuyq-617 0548a495a4 test for 'git fetch origin +refs/pull/#/merge' 2021-01-19 14:43:28 +08:00
liuyq-617 1c2a918c3d [TD-2784]<test>test pr from forked repo 2021-01-19 14:38:55 +08:00
liuyq-617 05372ddbda Merge branch 'develop' into test/testcase 2021-01-19 14:37:31 +08:00
Shengliang Guan dc11780c24
Merge pull request #4946 from taosdata/fix/TD-2697
[TD-2697]<fix>: fix buffer overflow
2021-01-19 14:34:59 +08:00
Elias Soong 6b0461f722 [TD-2639] <docs>: distinguish the concept Arbitrator and the command tarbitrator. 2021-01-19 14:26:16 +08:00
Elias Soong 55e4fa53bb [TD-2757] <docs>: fix description about VNode mem cache. 2021-01-19 14:14:51 +08:00
Minglei Jin 27d0be4c9d dummy commit to restart jenkins: remove two blank lines 2021-01-19 13:10:22 +08:00
Shuduo Sang f71db6f100 [TD-2775] <docs>: update faq regarding UPDATE parameter. 2021-01-19 10:58:47 +08:00