slguan
|
7a50c51c44
|
Merge pull request #916 from taosdata/feature/lihui
[add compile parameter if is arm]
|
2019-12-14 17:04:17 +08:00 |
|
slguan
|
13593bdac8
|
Merge pull request #919 from taosdata/feature/fangstatic
python connector user guide
|
2019-12-14 17:03:26 +08:00 |
lihui
|
04b511632b
|
[TBASE-1337]
|
2019-12-14 16:54:06 +08:00 |
fang
|
227744a0b0
|
python connector user guide
|
2019-12-14 13:37:22 +08:00 |
|
lihui
|
115912544d
|
[TBASE-1339]
|
2019-12-13 15:12:35 +08:00 |
|
lihui
|
c8ea91862c
|
Merge branch 'develop' into feature/lihui
|
2019-12-13 14:42:21 +08:00 |
|
slguan
|
57923c6966
|
[TBASE-1305]
|
2019-12-12 20:20:45 +08:00 |
|
lihui
|
409695fb39
|
[add compile parameter if is arm]
|
2019-12-12 17:20:45 +08:00 |
|
slguan
|
16c3769b36
|
Merge pull request #912 from taosdata/feature/lihui
[uint64_t printf format]
|
2019-12-12 16:03:32 +08:00 |
plum-lihui
|
2027e7b2bb
|
Merge pull request #913 from taosdata/hotfix/TBASE-1273
Can drop non-existent databases
|
2019-12-12 16:03:18 +08:00 |
|
plum-lihui
|
69db6f24cc
|
Merge pull request #914 from taosdata/hotfix/TBASE-1273
can drop non-existent database
|
2019-12-12 16:02:39 +08:00 |
|
lihui
|
b473ba8ecc
|
[check return value]
|
2019-12-12 16:00:27 +08:00 |
|
lihui
|
24f6170b64
|
[update]
|
2019-12-12 15:41:50 +08:00 |
|
lihui
|
7b4830cf8b
|
[uint64_t printf format]
|
2019-12-12 13:54:38 +08:00 |
|
plum-lihui
|
e8f0c771de
|
Merge pull request #911 from taosdata/feature/slguan
remove some warnings
|
2019-12-12 11:06:46 +08:00 |
|
slguan
|
c6f9e04b67
|
remove some warnings
|
2019-12-12 10:45:29 +08:00 |
|
plum-lihui
|
2b09a97f69
|
Merge pull request #908 from taosdata/feature/slguan
remove some warnings
|
2019-12-12 09:44:48 +08:00 |
|
slguan
|
379156b13d
|
Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan
|
2019-12-11 22:38:00 +08:00 |
|
slguan
|
9923099f69
|
Merge branch 'develop' into feature/slguan
|
2019-12-11 22:37:38 +08:00 |
|
slguan
|
be2c6f5d42
|
Merge pull request #905 from taosdata/hotfix/TBASE-1241
Changed publicIp communication method
|
2019-12-11 22:32:28 +08:00 |
|
slguan
|
f8453c14db
|
Merge branch 'develop' into hotfix/TBASE-1241
|
2019-12-11 22:32:08 +08:00 |
|
slguan
|
cbd3228f2d
|
remove some warnings
|
2019-12-11 22:08:17 +08:00 |
|
slguan
|
a5a3fb8f00
|
Merge branch 'develop' into feature/slguan
|
2019-12-11 21:18:53 +08:00 |
|
slguan
|
59fd6fe880
|
Merge pull request #907 from taosdata/feature/liaohj
Feature/liaohj
|
2019-12-11 21:16:44 +08:00 |
hjxilinx
|
e03f3364b8
|
[tbase-1326]
|
2019-12-11 21:03:52 +08:00 |
|
hjxilinx
|
c060be25b9
|
[tbase-1327]
|
2019-12-11 21:02:32 +08:00 |
|
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 |