Commit Graph

1392 Commits

Author SHA1 Message Date
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
slguan bba2bbf1ab #586 [TBASE-1330] 2019-12-21 15:04:06 +08:00
hjxilinx f6d56d843b fix bug in issue #984. [tbase-1384] 2019-12-21 14:59:03 +08:00
slguan 9a0ef41bc2
Merge pull request #980 from taosdata/feature/grafana_plugin
Feature/grafana plugin
2019-12-21 12:31:11 +08:00
slguan a6c2214440
Merge pull request #981 from taosdata/patch/tbase-1381
fix tbase-1381
2019-12-21 12:30:37 +08:00
slguan 7286056fba #982 [TBASE-1383] 2019-12-21 12:27:45 +08:00
slguan 968e64b6ba version.c 2019-12-21 11:16:08 +08:00
localvar 7148743eef fix tbase-1381 2019-12-21 09:14:01 +08:00
xieyinglin 8beea96f29 edit some sytyle 2019-12-20 20:11:57 +08:00
xieyinglin 9fc6a788ee add colon 2019-12-20 20:08:39 +08:00
xieyinglin 29bc0c665f update grafana doc 2019-12-20 20:00:50 +08:00
slguan 2ea7143870
Merge pull request #979 from taosdata/feature/grafana_plugin
Feature/grafana plugin
2019-12-20 19:38:13 +08:00
xieyinglin 6b4742b4ae upgrade mocha version 2019-12-20 19:33:54 +08:00
xieyinglin 7cbc6c2b4e Upgrade diff to version 3.5.0 2019-12-20 19:20:11 +08:00
slguan b70170018a #586 [TBASE-1330] 2019-12-20 18:42:53 +08:00
haojun Liao 40a4ae1fd2
Merge pull request #976 from taosdata/hotfix/slguan
#586 [TBASE-1330]
2019-12-20 18:40:53 +08:00
haojun Liao 027d26c789
Merge pull request #977 from taosdata/hotfix/slguan
#586 [TBASE-1330]
2019-12-20 18:40:10 +08:00
slguan edeb80f4f6 #586 [TBASE-1330] 2019-12-20 18:25:27 +08:00
slguan c44836934f Merge branch 'master' into develop
# Conflicts:
#	src/client/inc/tsclient.h
2019-12-20 15:27:13 +08:00
slguan 46dd88a921
Merge pull request #973 from taosdata/master-lihui
[TBASE-1360]
2019-12-20 15:20:53 +08:00
lihui 14349874f4 [TBASE-1360] 2019-12-20 15:17:05 +08:00
hjxilinx f66963ca7a add some logs. 2019-12-20 14:33:53 +08:00
xieyinglin 42816aab34 edit dependency version 2019-12-20 12:07:43 +08:00
slguan 172c8a7292
Merge pull request #970 from taosdata/feature/liaohj
Feature/liaohj
2019-12-20 11:59:51 +08:00
haojun Liao 5f6e03a827
Merge pull request #956 from taosdata/feature/slguan
remove some warnings
2019-12-20 11:54:58 +08:00
Frozen 687897bef8 add support of Alpine Linux 2019-12-20 11:53:15 +08:00
Frozen 79389aaaaf fix issue of readlink 2019-12-20 11:53:06 +08:00
Frozen bf683119fa fix missing header of pthread.h 2019-12-20 11:52:58 +08:00
Frozen c04a890124 fix type error of __off_t 2019-12-20 11:52:45 +08:00
hjxilinx 568f874d12 fix bug in issue #969. [tbase-1368] 2019-12-20 11:43:29 +08:00
hjxilinx 14fe658f82 refactor some codes, remove the mmap of header file for super table query. issue #969 [tbase-1368] 2019-12-20 11:34:30 +08:00
slguan 3f19b39492
Merge pull request #967 from taosdata/hz_master
add a simple assert
2019-12-20 10:20:56 +08:00
slguan 1f6f94afae
Merge pull request #965 from taosdata/hzcheng
add a simple assert
2019-12-20 10:19:43 +08:00
Hongze Cheng b63241867c add a simple assert 2019-12-20 10:09:56 +08:00
Hongze Cheng 5b57c9ac55 add a simple assert 2019-12-20 09:57:13 +08:00