Commit Graph

27626 Commits

Author SHA1 Message Date
slguan 106901a41d #1022 2019-12-26 17:13:38 +08:00
haojun Liao 673398f543
Merge pull request #1021 from taosdata/master
Master
2019-12-26 16:12:55 +08:00
haojun Liao f9e94ff3b5
Merge pull request #1015 from taosdata/hotfix/slguan
#1014 group by nchar results incorrect in windows
2019-12-26 15:41:50 +08:00
slguan 38ce963e70 #1014 [TBASE-1376] 2019-12-25 18:44:50 +08:00
slguan dab5d07355 #1014 [TBASE-1376] 2019-12-25 18:43:52 +08:00
slguan 365795cae8 #1014 [TBASE-1376] 2019-12-25 18:40:59 +08:00
slguan 4b5f0c12db Merge branch 'master' into hotfix/slguan 2019-12-25 18:35:47 +08:00
slguan 8f3fe94ae9 #1014 [TBASE-1376] 2019-12-25 18:35:21 +08:00
fangpanpan f62ccb426e
Merge pull request #1013 from taosdata/feature/lihui
[#971]
2019-12-25 18:09:15 +08:00
lihui 3e5d1c3644 [#971] 2019-12-25 18:00:18 +08:00
plum-lihui b74714649e
Merge pull request #971 from xrdavies/alpine_support
Alpine support
2019-12-25 17:36:59 +08:00
hjxilinx e9cc28edf0 update the feature referred in issue#1009. [tbase-1380] 2019-12-25 11:57:19 +08:00
haojun Liao 8f7b7adb38
Merge pull request #1008 from taosdata/feature/slguan
#1003 [TBASE-779]
2019-12-25 11:24:34 +08:00
slguan 740b8f1218 #1003 [TBASE-779] 2019-12-24 21:23:24 +08:00
fangpanpan dec249cfac
Merge pull request #1007 from taosdata/master-lihui
[#1005 TBASE-1392]
2019-12-24 17:52:05 +08:00
lihui 5bcdd606ba [#1005 TBASE-1392] 2019-12-24 17:50:01 +08:00
fangpanpan 6af353b8e9
Merge pull request #1006 from taosdata/feature/lihui
[#1005 TBASE-1392]
2019-12-24 17:49:46 +08:00
lihui 25c62de407 [#1005 TBASE-1392] 2019-12-24 17:43:16 +08:00
haojun Liao 56d5493072
Merge pull request #1004 from taosdata/feature/slguan
#1003 [TBASE-779]
2019-12-24 17:19:00 +08:00
slguan 9d864c65f3 #1003 [TBASE-779] 2019-12-24 17:07:17 +08:00
slguan 7a1311fd0f #1003 [TBASE-779] 2019-12-24 17:06:24 +08:00
slguan 46b3f52077 #1003 [TBASE-779] 2019-12-24 17:00:29 +08:00
slguan af4b51cc84
Merge pull request #1002 from taosdata/feature/lihui
[#974]
2019-12-24 16:55:07 +08:00
lihui 7934e0fa67 [#974] 2019-12-24 15:11:40 +08:00
plum-lihui b5e2d87c24
Merge pull request #1001 from taosdata/feature/slguan
change function definition
2019-12-24 15:10:01 +08:00
slguan c413d18b35 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan 2019-12-24 14:53:35 +08:00
slguan 5d5549adb6 change function definition 2019-12-24 14:47:41 +08:00
slguan 596214598c
Merge pull request #1000 from taosdata/feature/lihui
[1361]
2019-12-24 10:40:25 +08:00
lihui 6e35d6c478 [1361] 2019-12-24 10:32:35 +08:00
plum-lihui 4f5147de51
Merge pull request #998 from taosdata/master
merge from master to develop
2019-12-24 09:55:02 +08:00
fangpanpan 3e9cfea82a
Merge pull request #997 from taosdata/feature/lihui
[TBASE-816]
2019-12-23 14:57:52 +08:00
lihui 961a6c15ff [TBASE-816] 2019-12-23 14:56:02 +08:00
xieyinglin 5b7f679618 add template variable support for query alias 2019-12-23 14:49:54 +08:00
fangpanpan 84de4fbaab
Merge pull request #996 from taosdata/feature/lihui
[TBASE-816]
2019-12-23 11:49:45 +08:00
lihui ca6a7ba37b [TBASE-816] 2019-12-23 11:22:49 +08:00
plum-lihui 702efe5da1
Merge pull request #994 from taosdata/hotfix/slguan
SQL "show vnodes <dnodeIp>" executes incorrectly
2019-12-21 17:23:18 +08:00
plum-lihui 3e1f3df371
Merge pull request #995 from taosdata/feature/slguan
SQL "show vnodes <dnodeIp>" executes incorrectly
2019-12-21 17:22:13 +08:00
slguan 933d76e706 #994 2019-12-21 17:20:31 +08:00
slguan 2949237018
Merge pull request #991 from taosdata/feature/liaohj
Fix the bug referred to in issue #990. [tbase-1386].
2019-12-21 17:17:02 +08:00
plum-lihui b1adc3f9e3
Merge pull request #983 from taosdata/beta/v1.6.5.1
develop branch fails to compile on windows platform
2019-12-21 17:14:37 +08:00
hjxilinx 4b72c79fc2 refactor some codes. 2019-12-21 17:12:56 +08:00
slguan 29166b24a9 [TBASE-1387] #992 2019-12-21 17:09:36 +08:00
hjxilinx f8c150da24 Fix the bug referred to in issue #990. [tbase-1386]. 2019-12-21 17:05:41 +08:00
slguan 3cd3ff0483
Merge pull request #989 from taosdata/feature/liaohj
Fix bugs in issue #988. Fix corresponding invalid and memory leak pro…
2019-12-21 16:51:14 +08:00
slguan 74e3216eb7
Merge pull request #987 from taosdata/master
Master
2019-12-21 16:50:38 +08:00
hjxilinx d69b1d1b3d Fix bugs in issue #988. Fix corresponding invalid and memory leak problems. [tbase-1382]. 2019-12-21 16:46:39 +08:00
slguan 27f5a5ce41
Merge pull request #986 from taosdata/feature/liaohj
fix bug in issue #946 [tbase-1359]
2019-12-21 15:31:06 +08:00
hjxilinx 9904067b76 fix bug in issue #946 [tbase-1359] 2019-12-21 15:19:13 +08:00
slguan 07b32ec20e
Merge pull request #985 from taosdata/feature/liaohj
Feature/liaohj
2019-12-21 15:18:32 +08:00
haojun Liao 54af4c1861
Merge pull request #978 from taosdata/hotfix/slguan
#586 [TBASE-1330]
2019-12-21 15:08:48 +08:00