slguan
|
4117607232
|
Merge remote-tracking branch 'origin/develop' into feature/mergecode
# Conflicts:
# src/client/src/TSDBJNIConnector.c
|
2019-11-11 20:23:16 +08:00 |
|
slguan
|
1ca75c5a07
|
fix bugs in package script
|
2019-11-11 20:22:28 +08:00 |
Hongze Cheng
|
1b1b71dd24
|
Fix problem JIRA TBASE-1100
|
2019-11-11 16:50:35 +08:00 |
fangpanpan
|
f5032bd579
|
Merge pull request #703 from taosdata/feature/lihui
[TBASE-816]
|
2019-11-11 16:45:42 +08:00 |
|
fangpanpan
|
1ebd80ea69
|
Update connector-ch.md
|
2019-11-11 16:38:32 +08:00 |
lihui
|
f740e8bc1e
|
[TBASE-816]
|
2019-11-11 16:30:21 +08:00 |
|
slguan
|
41c28f7a13
|
Merge pull request #701 from taosdata/feature/liaohj
[TBASE-1099] fix bug referred in issue #699, refactor some codes
|
2019-11-11 16:28:00 +08:00 |
hjxilinx
|
acce71dbf3
|
[TBASE-1099] fix bug referred in issue #699, refactor some codes
|
2019-11-11 16:08:49 +08:00 |
|
fangpanpan
|
cdfedd801b
|
Merge pull request #700 from taosdata/feature/lihui
Feature/lihui
|
2019-11-11 15:55:31 +08:00 |
|
lihui
|
e521288582
|
[TBASE-816]
|
2019-11-11 15:43:25 +08:00 |
|
lihui
|
e9c56255ef
|
Merge branch 'develop' into feature/lihui
|
2019-11-11 15:09:06 +08:00 |
|
fangpanpan
|
6f553c571b
|
Merge pull request #698 from taosdata/feature/lihui
Feature/lihui
|
2019-11-11 15:08:59 +08:00 |
|
lihui
|
27a508b7f9
|
[TBASE-816]
|
2019-11-11 14:49:18 +08:00 |
|
lihui
|
96289dc358
|
[TBASE-816]
|
2019-11-11 14:44:10 +08:00 |
|
Hongze Cheng
|
9cdbc4848a
|
fix merge import bug in JIRA TBASE-1097
|
2019-11-11 14:32:07 +08:00 |
|
lihui
|
ee112120ff
|
[TBASE-816]
|
2019-11-11 14:18:31 +08:00 |
plum-lihui
|
b68d5e88c3
|
Merge pull request #696 from taosdata/feature/tliu
[TBASE-1047]
|
2019-11-11 13:24:32 +08:00 |
|
slguan
|
976ed04afc
|
Merge pull request #697 from taosdata/feature/liaohj
Feature/liaohj
|
2019-11-11 13:18:28 +08:00 |
|
slguan
|
9eabf5fd0a
|
Merge pull request #695 from taosdata/feature/newtimer
Feature/newtimer
|
2019-11-11 13:16:59 +08:00 |
|
hjxilinx
|
d609fe319a
|
remove unused code
|
2019-11-11 13:11:36 +08:00 |
|
hjxilinx
|
1aa5f927f3
|
[TBASE-1098]fix failed to drop a db, of which name start with "log" issue #686
|
2019-11-11 13:08:50 +08:00 |
|
slguan
|
73516d5daa
|
Merge remote-tracking branch 'origin/develop' into release/v1.6.4.0
|
2019-11-11 13:05:14 +08:00 |
|
slguan
|
2a11363e0c
|
[TBASE-1060]
|
2019-11-11 13:04:09 +08:00 |
liu0x54
|
db26cf1e8e
|
[TBASE-1047] Go connector prints all the SQL. This will harm the performance and consume unnecessary hard disk space. Modified to print only the SQLs which returns error.
|
2019-11-11 12:39:48 +08:00 |
|
hzcheng
|
e54df4d7bf
|
Merge pull request #692 from taosdata/feature/lihui
[TBASE-816]
|
2019-11-11 12:20:55 +08:00 |
localvar
|
48c60fd01a
|
update timer log format
|
2019-11-11 04:15:06 +00:00 |
|
localvar
|
1f78d9b859
|
make(rollback) max timer controller number to 512 and make it configurable.
|
2019-11-11 04:15:06 +00:00 |
|
slguan
|
fcc308fb40
|
Merge pull request #694 from taosdata/feature/liaohj
Feature/liaohj
|
2019-11-11 12:03:49 +08:00 |
|
hjxilinx
|
5400e49c7e
|
refactor some code, fix the used time too big bug.
|
2019-11-11 11:58:20 +08:00 |
|
hjxilinx
|
7ed580d93b
|
fix some memory leaks
|
2019-11-11 11:55:49 +08:00 |
|
lihui
|
15cb828bea
|
[TBASE-816]
|
2019-11-11 11:11:25 +08:00 |
|
lihui
|
85c644ae66
|
[TBASE-816]
|
2019-11-11 10:56:53 +08:00 |
|
lihui
|
d04354a8ac
|
[TBASE-816]
|
2019-11-11 10:19:40 +08:00 |
|
hjxilinx
|
d3c5320b1f
|
Merge branch 'develop' into feature/liaohj
|
2019-11-10 22:50:40 +08:00 |
|
Hongze Cheng
|
c012704a5b
|
Submit the first version of merge import
|
2019-11-10 19:54:05 +08:00 |
|
hjxilinx
|
c0d6cb743f
|
refactor the header file format in client module
|
2019-11-09 22:38:22 +08:00 |
|
hjxilinx
|
4918783d5a
|
refactor the header file format in client module
|
2019-11-09 22:30:27 +08:00 |
|
slguan
|
6e14f9dc8b
|
Client and server versions may not match
|
2019-11-09 14:37:44 +08:00 |
|
fangpanpan
|
d3941fe95b
|
Merge pull request #689 from taosdata/feature/mergecode
Unable to establish connection when IP address is NULL
|
2019-11-09 13:52:16 +08:00 |
|
root
|
3c3edeb241
|
Unable to establish connection when IP address is NULL
|
2019-11-09 13:39:30 +08:00 |
xieyinglin
|
6da3459841
|
Merge pull request #688 from taosdata/feature/grafana_plugin
fix grafana bugs
|
2019-11-09 11:14:43 +08:00 |
|
slguan
|
b6204c9c41
|
fix grafana bugs
|
2019-11-08 15:58:12 +08:00 |
|
slguan
|
4a3e086c4d
|
Merge pull request #685 from taosdata/feature/prepare
documentation of statement preparation API
|
2019-11-08 14:27:35 +08:00 |
|
slguan
|
51943b6f0e
|
Merge pull request #684 from taosdata/feature/newtimer
new timer implementation
|
2019-11-08 14:26:52 +08:00 |
|
localvar
|
5365b56ab4
|
TBASE-794: update documentation
|
2019-11-08 05:26:00 +00:00 |
|
localvar
|
82ce093aff
|
TBASE-870: fix link error in windows
|
2019-11-08 05:10:03 +00:00 |
|
localvar
|
128a49fc2d
|
TBASE-870
|
2019-11-08 02:48:43 +00:00 |
|
slguan
|
1c3fcabe04
|
Merge branch 'develop' into feature/mergecode
|
2019-11-07 22:34:39 +08:00 |
|
slguan
|
ec63e58813
|
fix package script error
|
2019-11-07 22:34:08 +08:00 |
|
slguan
|
b57c527f93
|
Merge pull request #683 from taosdata/feature/mergecode
fix some compile errors
|
2019-11-07 20:27:46 +08:00 |