slguan
|
b9a62d60dc
|
Merge pull request #869 from taosdata/hotfix/#868
fix #868
|
2019-12-07 15:03:45 +08:00 |
Hongze Cheng
|
79b2344c47
|
fix #868
|
2019-12-07 15:00:22 +08:00 |
fangpanpan
|
bcc03bad21
|
Merge pull request #863 from taosdata/release/v1.6.4.2
Release/v1.6.4.2
|
2019-12-06 14:24:58 +08:00 |
|
slguan
|
c972e1ca8f
|
version.c
|
2019-12-06 13:59:39 +08:00 |
|
slguan
|
cbdeb351df
|
version.c
|
2019-12-06 13:53:26 +08:00 |
|
hzcheng
|
514f2ed512
|
Merge pull request #860 from taosdata/hotfix/TBASE-1284
[TBASE-1284]
|
2019-12-06 10:25:12 +08:00 |
|
slguan
|
a56b019a25
|
[TBASE-1284]
|
2019-12-06 10:21:27 +08:00 |
|
slguan
|
92a9613e7c
|
[TBASE-1284]
|
2019-12-06 10:14:07 +08:00 |
|
slguan
|
a425bb51c6
|
Merge pull request #857 from taosdata/hotfix/#856
fix #856
|
2019-12-05 15:46:37 +08:00 |
|
Hongze Cheng
|
cff3009a41
|
fix #856
|
2019-12-05 15:40:09 +08:00 |
|
slguan
|
527027d5f9
|
Merge pull request #844 from taosdata/feature/liaohj
[tbase-1269]
|
2019-12-04 10:03:27 +08:00 |
haojun Liao
|
893fac9da7
|
Merge pull request #824 from taosdata/hotfix/restful1
Hotfix/restful1
|
2019-12-02 21:37:55 +08:00 |
|
slguan
|
de5047f4b2
|
Merge pull request #821 from taosdata/feature/lihui
Feature/lihui
|
2019-12-02 20:37:41 +08:00 |
|
slguan
|
2002c8e20b
|
rror may occur when reading http chunked body
|
2019-12-02 20:34:32 +08:00 |
lihui
|
d468cc5eb2
|
[TBASE-1271]
|
2019-12-02 19:01:20 +08:00 |
|
slguan
|
5e2d9325fd
|
Merge pull request #815 from taosdata/hotfix/#813
Hotfix/#813
|
2019-12-02 16:19:16 +08:00 |
|
Hongze Cheng
|
167d6cb70e
|
fix #813
|
2019-12-02 15:47:18 +08:00 |
plum-lihui
|
d15d76886f
|
Merge pull request #810 from taosdata/release/v1.6.4.0
fix some release scripts
|
2019-12-02 13:55:04 +08:00 |
|
plum-lihui
|
cd8c4f8e3d
|
Merge pull request #811 from taosdata/feature/tliu
[TBASE 1270]revise the go connector description
|
2019-12-02 11:35:14 +08:00 |
liu0x54
|
2e60dfb3a0
|
[TBASE 1270]revise the go connector description
|
2019-12-02 11:13:33 +08:00 |
hjxilinx
|
eaa767be1b
|
[tbase-1269]
|
2019-12-01 21:34:39 +08:00 |
|
slguan
|
faca8084e1
|
resolve conflicts
|
2019-12-01 13:24:12 +08:00 |
|
slguan
|
6a3b837951
|
Merge branch 'release/v1.6.4.0'
# Conflicts:
# src/os/windows/src/twindows.c
# src/system/src/vnodeImport.c
# src/util/src/tutil.c
|
2019-12-01 13:19:13 +08:00 |
|
slguan
|
a7f79b508f
|
public v1.6.4.0
|
2019-12-01 12:27:29 +08:00 |
|
slguan
|
6d27c11e3b
|
Merge branch 'develop' into release/v1.6.4.0
|
2019-12-01 09:30:23 +08:00 |
|
slguan
|
79fc94f019
|
[TBASE-1280]
|
2019-12-01 09:29:58 +08:00 |
|
slguan
|
0224972e63
|
fix some release scripts
|
2019-11-30 23:17:58 +08:00 |
|
hzcheng
|
59e60e457f
|
Merge pull request #809 from taosdata/hotfix/#808
fix #808
|
2019-11-30 23:14:07 +08:00 |
Jeff Tao
|
27f52b8975
|
fix #808
|
2019-11-30 22:37:22 +08:00 |
|
slguan
|
e86237890e
|
Merge pull request #807 from taosdata/feature/lihui
[modify the name of the client install package]
|
2019-11-30 18:27:33 +08:00 |
|
huili
|
6bc4ab252b
|
[modify the name of the client install package]
|
2019-11-30 18:08:57 +08:00 |
|
slguan
|
5cb0639250
|
Merge pull request #806 from taosdata/feature/liaohj
fix bug issue #804
|
2019-11-30 17:00:07 +08:00 |
|
hjxilinx
|
8b549b4eff
|
fix bug issue #804
|
2019-11-30 16:58:10 +08:00 |
|
slguan
|
558c964995
|
Merge pull request #805 from taosdata/feature/liaohj
Feature/liaohj
|
2019-11-30 16:44:13 +08:00 |
|
hjxilinx
|
0d963c5ab7
|
[jira none]
|
2019-11-30 15:41:00 +08:00 |
|
hjxilinx
|
15b467ab77
|
[tbase-1007]
|
2019-11-30 15:25:43 +08:00 |
|
hzcheng
|
1caa90dc9e
|
Merge pull request #803 from taosdata/feature/slguan
update some error message
|
2019-11-30 14:47:30 +08:00 |
|
slguan
|
a46b27c2c2
|
update some error message
|
2019-11-30 10:20:58 +08:00 |
Jeff Tao
|
22fe4b193f
|
Merge pull request #792 from taosdata/feature/mergeimport
Feature/mergeimport
|
2019-11-30 09:47:38 +08:00 |
Bomin Zhang
|
aefc043645
|
Merge pull request #801 from taosdata/feature/lihui
[TBASE-816]
|
2019-11-29 18:38:26 +08:00 |
|
lihui
|
2124c23611
|
[TBASE-816]
|
2019-11-29 18:22:39 +08:00 |
|
Hongze Cheng
|
f06e25fe1a
|
Merge branch 'develop' into feature/mergeimport
|
2019-11-29 15:24:51 +08:00 |
|
Hongze Cheng
|
92e5e239f6
|
refact more
|
2019-11-29 15:15:28 +08:00 |
|
Hongze Cheng
|
a51d109adb
|
refact part of code
|
2019-11-29 14:28:03 +08:00 |
|
Hongze Cheng
|
a27fcc52b8
|
refactor part of code
|
2019-11-29 11:50:15 +08:00 |
|
Hongze Cheng
|
56bb3121ad
|
refactor part of code
|
2019-11-29 10:19:08 +08:00 |
|
Hongze Cheng
|
6fabe650af
|
change var name
|
2019-11-29 09:39:18 +08:00 |
|
slguan
|
a5a1b0ee95
|
Merge branch 'develop' into feature/slguan
|
2019-11-28 22:51:26 +08:00 |
|
slguan
|
1353cff064
|
fix issue #626 and [TBASE-1192]
|
2019-11-28 22:45:35 +08:00 |
|
slguan
|
63a5d22320
|
fix issue #626 and [TBASE-1192]
|
2019-11-28 22:29:30 +08:00 |