xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
27,626 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

27626 Commits

Author SHA1 Message Date
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
xieyinglin cc9626f438
Merge pull request #962 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/underscore.string-3.3.5 
Bump underscore.string from 3.3.4 to 3.3.5 in /src/connector/grafana/tdengine
 2019-12-20 09:55:45 +08:00
xieyinglin 1cd00f0cfb
Merge pull request #961 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/sshpk-1.16.1 
Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine
 2019-12-20 09:54:49 +08:00
xieyinglin 44478b1f51
Merge pull request #960 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/lodash-4.17.13 
Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine
 2019-12-20 09:52:50 +08:00
xieyinglin 805f5a50b7
Merge pull request #959 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/extend-3.0.2 
Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine
 2019-12-20 09:50:30 +08:00
dependabot[bot] 60f2df648f
Bump underscore.string in /src/connector/grafana/tdengine 
Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/epeli/underscore.string/releases)
- [Changelog](https://github.com/esamattis/underscore.string/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/epeli/underscore.string/compare/3.3.4...3.3.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:33 +00:00
dependabot[bot] cd092242a5
Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine 
Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.10.2 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.10.2...v1.16.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:32 +00:00
dependabot[bot] 23a6bee2d2
Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:31 +00:00
dependabot[bot] ef3f9bcdcd
Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine 
Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/justmoon/node-extend/releases)
- [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/justmoon/node-extend/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-20 01:38:31 +00:00
slguan 31ef0a7abd
Merge pull request #957 from taosdata/feature/grafana_plugin 
Feature/grafana plugin
 2019-12-20 09:37:52 +08:00
xieyinglin c47a3771c0 replace import dashboard image 2019-12-19 20:36:04 +08:00
xieyinglin c7148e4e47 Merge branch 'develop' into feature/grafana_plugin 2019-12-19 20:03:27 +08:00
xieyinglin d80af197d5 add support for custom template variable 2019-12-19 19:54:05 +08:00
slguan 0f06cbc5fd remove some warnings 2019-12-19 19:13:38 +08:00
haojun Liao 682bcb2d6d
Merge pull request #955 from taosdata/master 
merge master into develop
 2019-12-19 18:03:11 +08:00
haojun Liao c8fff94537
Merge pull request #954 from taosdata/feature/#928 
Data write request is not redirected in multiple copies, causing slow write speed
 2019-12-19 17:50:43 +08:00
haojun Liao 49df101592
Merge pull request #953 from taosdata/feature/lihui 
[TBASE-1360]
 2019-12-19 17:49:39 +08:00