hjxilinx
|
8636bc95aa
|
[tbase-1326]
|
2019-12-11 20:23:34 +08:00 |
slguan
|
a8f1512430
|
Merge branch 'develop' into feature/slguan
# Conflicts:
# src/util/src/version.c
|
2019-12-11 18:38:50 +08:00 |
|
slguan
|
ca27c92c38
|
Merge branch 'master' into feature/slguan
# Conflicts:
# src/util/src/version.c
|
2019-12-11 18:38:14 +08:00 |
|
slguan
|
77f2784f3a
|
Merge pull request #890 from taosdata/feature/fangstatic
Feature/fangstatic
|
2019-12-11 18:17:09 +08:00 |
|
hjxilinx
|
38d377b421
|
[tbase-1328]
|
2019-12-11 16:49:46 +08:00 |
|
slguan
|
6dfc958cf4
|
[TBASE-1241]
|
2019-12-11 16:30:40 +08:00 |
|
slguan
|
a3c0c50d90
|
[TBASE-1241]
|
2019-12-11 16:22:11 +08:00 |
|
slguan
|
7d6db536d0
|
[TBASE-1241]
|
2019-12-11 16:19:44 +08:00 |
|
hjxilinx
|
992a449ed6
|
[tbase-1327]
|
2019-12-11 15:30:54 +08:00 |
|
slguan
|
8314e22328
|
[TBASE-1241]
|
2019-12-11 15:23:08 +08:00 |
|
slguan
|
04b5df6273
|
[TBASE-1241]
|
2019-12-11 15:12:17 +08:00 |
|
slguan
|
d774aa3993
|
[TBASE-1241]
|
2019-12-11 14:39:48 +08:00 |
fang
|
e0c005c71b
|
Merge branch 'develop' into feature/fangstatic
|
2019-12-11 13:51:19 +08:00 |
|
hjxilinx
|
1570fadf99
|
[tbase-1326]
|
2019-12-11 11:55:22 +08:00 |
|
slguan
|
3cb8d91c6f
|
Merge branch 'master' into develop
# Conflicts:
# src/client/src/tscSQLParser.c
|
2019-12-10 19:32:03 +08:00 |
|
slguan
|
7301d83d11
|
Merge branch 'hotfix/TBASE-1325'
|
2019-12-10 19:30:08 +08:00 |
hzcheng
|
1982ef14a7
|
Merge pull request #903 from taosdata/hotfix/TBASE-1325
Hotfix/tbase 1325
|
2019-12-10 19:20:54 +08:00 |
|
hzcheng
|
691746e895
|
Merge branch 'develop' into hotfix/TBASE-1325
|
2019-12-10 19:20:44 +08:00 |
|
slguan
|
a26f368c21
|
[TBASE-1325]
|
2019-12-10 19:18:16 +08:00 |
|
slguan
|
f061d05ded
|
Merge pull request #902 from taosdata/feature/lihui
[TBASE-816]
|
2019-12-10 18:44:26 +08:00 |
lihui
|
e1b11fbb3b
|
[TBASE-816]
|
2019-12-10 18:42:07 +08:00 |
|
slguan
|
19e7565930
|
Merge pull request #899 from taosdata/hotfix-#898
Update tscUtil.c
|
2019-12-10 18:01:13 +08:00 |
haojun Liao
|
7538f4e755
|
Update tscSQLParser.c
|
2019-12-10 17:57:06 +08:00 |
|
haojun Liao
|
e08aa1ab03
|
Update tscUtil.c
fix bugs in issue #898
|
2019-12-10 17:45:41 +08:00 |
|
slguan
|
2ac3c3f04e
|
Merge pull request #897 from taosdata/feature/liaohj
remove the compiler warnings
|
2019-12-10 17:45:09 +08:00 |
|
slguan
|
10a15d9526
|
Merge pull request #895 from taosdata/hzcheng
resolve warnings in kit
|
2019-12-10 17:44:54 +08:00 |
|
slguan
|
1475d520a9
|
[TBASE-1241]
|
2019-12-10 17:36:43 +08:00 |
fangpanpan
|
49082a7ea2
|
Merge pull request #896 from taosdata/feature/lihui
[TBASE-1323]
|
2019-12-10 16:52:14 +08:00 |
|
hjxilinx
|
7a74561f6f
|
[tbase-1324]
|
2019-12-10 16:48:47 +08:00 |
|
lihui
|
eb6533a96e
|
[TBASE-1323]
|
2019-12-10 16:42:29 +08:00 |
|
Hongze Cheng
|
9f164ab063
|
resolve warnings in kit
|
2019-12-10 16:31:44 +08:00 |
|
hjxilinx
|
7568052d03
|
remove the compiler warnings
|
2019-12-10 16:21:58 +08:00 |
|
slguan
|
fcfb35d1ad
|
Merge pull request #893 from taosdata/feature/liaohj
remove the compiler warnings
|
2019-12-10 15:04:44 +08:00 |
|
hjxilinx
|
085c2296c5
|
remove the compiler warnings
|
2019-12-10 14:52:41 +08:00 |
|
slguan
|
b07e3dfd07
|
[TBASE-1241]
|
2019-12-10 14:52:16 +08:00 |
|
slguan
|
68072018b8
|
Merge pull request #892 from taosdata/feature/liaohj
Feature/liaohj
|
2019-12-10 13:35:02 +08:00 |
|
slguan
|
20d2e54aac
|
Merge branch 'develop' into feature/liaohj
|
2019-12-10 13:34:50 +08:00 |
|
slguan
|
2bf71e7107
|
[TBASE-1241]
|
2019-12-10 13:00:00 +08:00 |
|
hjxilinx
|
19d5161690
|
[tbase-1316]
|
2019-12-10 12:39:01 +08:00 |
|
hjxilinx
|
6c860c7393
|
[tbase-1317]
|
2019-12-10 12:35:45 +08:00 |
|
hjxilinx
|
d2ef1dad53
|
[tbase-1287]
|
2019-12-10 12:16:10 +08:00 |
|
haojun Liao
|
a510bfbf56
|
Merge pull request #884 from taosdata/feature/slguan
Remove compiler warning options
|
2019-12-10 12:14:12 +08:00 |
|
slguan
|
430f1e4303
|
Merge pull request #891 from taosdata/feature-master/lihui
[TBASE-1142/1319]
|
2019-12-10 10:44:28 +08:00 |
|
lihui
|
103b8794da
|
[TBASE-1142/1319]
|
2019-12-10 10:36:12 +08:00 |
|
fang
|
c1057ce824
|
Merge branch 'develop' into feature/fangstatic
|
2019-12-10 09:43:04 +08:00 |
|
fang
|
959b6ec95c
|
solve some static check questions
|
2019-12-10 09:41:10 +08:00 |
Bomin Zhang
|
1a930db597
|
Merge pull request #888 from taosdata/feature/lihui
[NONE]
|
2019-12-10 09:33:26 +08:00 |
plum-lihui
|
0e5886b920
|
Merge pull request #882 from taosdata/feature/fangstatic
Feature/fangstatic
|
2019-12-10 09:32:02 +08:00 |
|
fang
|
c2a2c575a1
|
solve some statich check questions
|
2019-12-10 08:46:01 +08:00 |
|
fang
|
a2919d7811
|
Merge branch 'develop' into feature/fangstatic
|
2019-12-10 08:21:25 +08:00 |