Commit Graph

1768 Commits

Author SHA1 Message Date
lihui 5628086b7d [TBASE-1357] 2020-01-17 11:08:09 +08:00
plum-lihui 71c1dcb236
Merge pull request #1147 from taosdata/feature/slguan
documents
2020-01-17 09:44:21 +08:00
fangpanpan c48c78e6ee [update release info] 2020-01-17 09:38:14 +08:00
slguan ebad8fff9b
Merge pull request #1148 from taosdata/beta/v1.6.5.3
fix memory leaks
2020-01-16 22:00:13 +08:00
hjxilinx a63b848a97 fix memory leaks 2020-01-16 21:47:33 +08:00
slguan 91541ae13e documents 2020-01-16 18:25:01 +08:00
plum-lihui 670ea16cae
Merge pull request #1144 from taosdata/hjxilinx-patch-1
Update administrator-ch.md
2020-01-16 18:06:33 +08:00
plum-lihui 7d815b243b
Merge pull request #1145 from taosdata/feature/slguan
Mac client
2020-01-16 18:05:16 +08:00
haojun Liao fe0b850a5e
Update administrator-ch.md 2020-01-16 18:00:58 +08:00
slguan 36eef3ae10 #1133 #160 #417 TBASE-530 TBASE-801 2020-01-16 17:56:46 +08:00
slguan 88d7d099bb #1133 #160 #417 TBASE-530 TBASE-801 2020-01-16 17:45:57 +08:00
haojun Liao e124c8ee72
Merge pull request #1143 from taosdata/feature/slguan
fix compile errors
2020-01-16 17:35:04 +08:00
slguan e3db04f1a1 fix compile errors 2020-01-16 17:30:15 +08:00
lihui 700305490a [NONE] 2020-01-16 17:28:59 +08:00
slguan 2f68a4cdcf Merge branch 'master' into develop
# Conflicts:
#	src/client/src/tscServer.c
2020-01-16 17:09:07 +08:00
localvar fa8baf8022 subscribe: remove testing code from python connector 2020-01-16 16:58:13 +08:00
localvar bea87b34f1 subscribe: fix bugs found in test 2020-01-16 16:57:25 +08:00
lihui 5b39d4e2a6 [TBASE-1486] 2020-01-16 16:47:58 +08:00
haojun Liao 7b0088b594
Merge pull request #1141 from taosdata/feature/slguan
TBASE-1452  #1136
2020-01-16 16:46:49 +08:00
hjxilinx 5212e36e11 Merge branch 'feature/liaohj' of https://github.com/taosdata/TDengine into feature/liaohj 2020-01-16 16:38:48 +08:00
slguan faf5fc1f76
Merge pull request #1140 from taosdata/beta/v1.6.5.3
Beta/v1.6.5.3
2020-01-16 16:38:31 +08:00
slguan 733cb47343 TBASE-1452 #1136 2020-01-16 16:38:02 +08:00
hjxilinx eb2def1e96 fix memory leaks 2020-01-16 16:34:18 +08:00
hjxilinx 20dbf100de fix memory leaks 2020-01-16 16:32:55 +08:00
lihui dc87eda7c4 [TBASE-1486] 2020-01-16 03:36:16 -04:00
slguan 546a8cdf25 TBASE-1452 #1136 2020-01-16 14:44:04 +08:00
haojun Liao e3129e4efd
Merge pull request #1137 from taosdata/feature/slguan
TBASE-1452  #1136
2020-01-16 13:53:49 +08:00
slguan 1ab393c2a4
Merge pull request #1138 from taosdata/hzcheng
Add some assert for debug
2020-01-16 13:36:08 +08:00
slguan 6d1209ecac TBASE-1452 #1136 2020-01-16 13:20:23 +08:00
slguan 49ce73d016 TBASE-1452 #1136 2020-01-16 13:11:44 +08:00
plum-lihui 13ed8e1000
Merge pull request #1135 from taosdata/hotfix/slguan
#1130 TBASE-1484
2020-01-16 09:40:47 +08:00
lihui 97b6f96fd1 [get db from meterMetInfo] 2020-01-15 07:59:32 -04:00
Hongze Cheng 620358badd Add some assert for debug 2020-01-15 19:03:39 +08:00
hjxilinx 18fd1c6c26 fix memory leaks 2020-01-15 18:54:35 +08:00
hjxilinx c5dc9a1d7e fix error 2020-01-15 17:58:37 +08:00
hjxilinx c41f11aab5 merge develop branch 2020-01-15 17:51:18 +08:00
hjxilinx 777b4b06a4 refactor and fix memory leaks 2020-01-15 17:18:08 +08:00
hjxilinx 114dd6ea13 fix bugs and refactor code 2020-01-15 10:48:37 +08:00
slguan 4d8341c5cd Merge branch 'master' into hotfix/slguan 2020-01-15 10:12:08 +08:00
hjxilinx 7021d3f640 refactor codes 2020-01-15 09:49:36 +08:00
hjxilinx 9e5ddfe4cc add the support of issue #1131. [tbase-901] 2020-01-14 15:51:40 +08:00
slguan 3df6b4abab
Merge pull request #1129 from taosdata/feature/grafana_plugin
edit plugin id
2020-01-14 13:36:34 +08:00
localvar a7eaa8ad7e tbase-1470: python2&3, windows 2020-01-14 10:50:30 +08:00
hjxilinx ca136d47de add the support of issue #1131. [tbase-901] 2020-01-14 10:39:30 +08:00
slguan 981d7c5e02 #1130 TBASE-1484 2020-01-14 10:36:50 +08:00
localvar f12c270e69 tbase-1470: python2, linux 2020-01-14 10:16:11 +08:00
xieyinglin 1c943a71fd edit plugin id 2020-01-13 21:52:48 +08:00
slguan 8c05d36082 for async test 2020-01-13 19:03:01 +08:00
localvar 781c0ff6bc TBASE-1470: python3 & linux 2020-01-13 16:57:56 +08:00
localvar bae48b73c6 fix two bugs:
1. taos_consume block for evev
2. taos_fetch_block returns 0 in subscription
2020-01-13 16:50:17 +08:00