Commit Graph

  • 56d5493072
    Merge pull request #1004 from taosdata/feature/slguan haojun Liao 2019-12-24 17:19:00 +0800
  • 9d864c65f3 #1003 [TBASE-779] slguan 2019-12-24 17:07:17 +0800
  • 7a1311fd0f #1003 [TBASE-779] slguan 2019-12-24 17:06:24 +0800
  • 46b3f52077 #1003 [TBASE-779] slguan 2019-12-24 17:00:29 +0800
  • af4b51cc84
    Merge pull request #1002 from taosdata/feature/lihui slguan 2019-12-24 16:55:07 +0800
  • 7934e0fa67 [#974] lihui 2019-12-24 15:11:40 +0800
  • b5e2d87c24
    Merge pull request #1001 from taosdata/feature/slguan plum-lihui 2019-12-24 15:10:01 +0800
  • c413d18b35 Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan slguan 2019-12-24 14:53:35 +0800
  • 5d5549adb6 change function definition slguan 2019-12-24 14:47:41 +0800
  • 596214598c
    Merge pull request #1000 from taosdata/feature/lihui slguan 2019-12-24 10:40:25 +0800
  • 6e35d6c478 [1361] lihui 2019-12-24 10:32:35 +0800
  • 4f5147de51
    Merge pull request #998 from taosdata/master plum-lihui 2019-12-24 09:55:02 +0800
  • 3e9cfea82a
    Merge pull request #997 from taosdata/feature/lihui fangpanpan 2019-12-23 14:57:52 +0800
  • 961a6c15ff [TBASE-816] lihui 2019-12-23 14:56:02 +0800
  • 5b7f679618 add template variable support for query alias xieyinglin 2019-12-23 14:49:54 +0800
  • 84de4fbaab
    Merge pull request #996 from taosdata/feature/lihui fangpanpan 2019-12-23 11:49:45 +0800
  • ca6a7ba37b [TBASE-816] lihui 2019-12-23 11:22:49 +0800
  • 702efe5da1
    Merge pull request #994 from taosdata/hotfix/slguan plum-lihui 2019-12-21 17:23:18 +0800
  • 3e1f3df371
    Merge pull request #995 from taosdata/feature/slguan plum-lihui 2019-12-21 17:22:13 +0800
  • 933d76e706 #994 slguan 2019-12-21 17:20:31 +0800
  • 2949237018
    Merge pull request #991 from taosdata/feature/liaohj slguan 2019-12-21 17:17:02 +0800
  • b1adc3f9e3
    Merge pull request #983 from taosdata/beta/v1.6.5.1 plum-lihui 2019-12-21 17:14:37 +0800
  • 4b72c79fc2 refactor some codes. hjxilinx 2019-12-21 17:12:56 +0800
  • 29166b24a9 [TBASE-1387] #992 slguan 2019-12-21 17:09:36 +0800
  • f8c150da24 Fix the bug referred to in issue #990. [tbase-1386]. hjxilinx 2019-12-21 17:05:41 +0800
  • 3cd3ff0483
    Merge pull request #989 from taosdata/feature/liaohj slguan 2019-12-21 16:51:14 +0800
  • 74e3216eb7
    Merge pull request #987 from taosdata/master slguan 2019-12-21 16:50:38 +0800
  • d69b1d1b3d Fix bugs in issue #988. Fix corresponding invalid and memory leak problems. [tbase-1382]. hjxilinx 2019-12-21 16:46:39 +0800
  • 27f5a5ce41
    Merge pull request #986 from taosdata/feature/liaohj slguan 2019-12-21 15:31:06 +0800
  • 9904067b76 fix bug in issue #946 [tbase-1359] hjxilinx 2019-12-21 15:19:13 +0800
  • 07b32ec20e
    Merge pull request #985 from taosdata/feature/liaohj slguan 2019-12-21 15:18:32 +0800
  • 54af4c1861
    Merge pull request #978 from taosdata/hotfix/slguan haojun Liao 2019-12-21 15:08:48 +0800
  • bba2bbf1ab #586 [TBASE-1330] slguan 2019-12-21 15:04:06 +0800
  • f6d56d843b fix bug in issue #984. [tbase-1384] hjxilinx 2019-12-21 14:59:03 +0800
  • 9a0ef41bc2
    Merge pull request #980 from taosdata/feature/grafana_plugin slguan 2019-12-21 12:31:11 +0800
  • a6c2214440
    Merge pull request #981 from taosdata/patch/tbase-1381 slguan 2019-12-21 12:30:37 +0800
  • 7286056fba #982 [TBASE-1383] slguan 2019-12-21 12:27:45 +0800
  • 968e64b6ba version.c slguan 2019-12-21 11:16:08 +0800
  • 7148743eef fix tbase-1381 localvar 2019-12-21 09:14:01 +0800
  • 8beea96f29 edit some sytyle xieyinglin 2019-12-20 20:11:57 +0800
  • 9fc6a788ee add colon xieyinglin 2019-12-20 20:08:39 +0800
  • 29bc0c665f update grafana doc xieyinglin 2019-12-20 20:00:50 +0800
  • 2ea7143870
    Merge pull request #979 from taosdata/feature/grafana_plugin slguan 2019-12-20 19:38:13 +0800
  • 6b4742b4ae upgrade mocha version xieyinglin 2019-12-20 19:33:54 +0800
  • 7cbc6c2b4e Upgrade diff to version 3.5.0 xieyinglin 2019-12-20 19:20:11 +0800
  • b70170018a #586 [TBASE-1330] slguan 2019-12-20 18:42:53 +0800
  • 40a4ae1fd2
    Merge pull request #976 from taosdata/hotfix/slguan haojun Liao 2019-12-20 18:40:53 +0800
  • 027d26c789
    Merge pull request #977 from taosdata/hotfix/slguan haojun Liao 2019-12-20 18:40:10 +0800
  • edeb80f4f6 #586 [TBASE-1330] slguan 2019-12-20 18:25:27 +0800
  • c44836934f Merge branch 'master' into develop slguan 2019-12-20 15:27:13 +0800
  • 46dd88a921
    Merge pull request #973 from taosdata/master-lihui slguan 2019-12-20 15:20:53 +0800
  • 14349874f4 [TBASE-1360] lihui 2019-12-20 15:17:05 +0800
  • f66963ca7a add some logs. hjxilinx 2019-12-20 14:33:53 +0800
  • 42816aab34 edit dependency version xieyinglin 2019-12-20 12:07:43 +0800
  • 172c8a7292
    Merge pull request #970 from taosdata/feature/liaohj slguan 2019-12-20 11:59:51 +0800
  • 5f6e03a827
    Merge pull request #956 from taosdata/feature/slguan haojun Liao 2019-12-20 11:54:58 +0800
  • 687897bef8 add support of Alpine Linux Frozen 2019-12-20 11:47:37 +0800
  • 79389aaaaf fix issue of readlink Frozen 2019-12-20 11:47:09 +0800
  • bf683119fa fix missing header of pthread.h Frozen 2019-12-20 11:45:11 +0800
  • c04a890124 fix type error of __off_t Frozen 2019-12-20 11:44:49 +0800
  • 568f874d12 fix bug in issue #969. [tbase-1368] hjxilinx 2019-12-20 11:43:29 +0800
  • 14fe658f82 refactor some codes, remove the mmap of header file for super table query. issue #969 [tbase-1368] hjxilinx 2019-12-20 11:34:30 +0800
  • 3f19b39492
    Merge pull request #967 from taosdata/hz_master slguan 2019-12-20 10:20:56 +0800
  • 1f6f94afae
    Merge pull request #965 from taosdata/hzcheng slguan 2019-12-20 10:19:43 +0800
  • b63241867c add a simple assert Hongze Cheng 2019-12-20 10:09:56 +0800
  • 5b57c9ac55 add a simple assert Hongze Cheng 2019-12-20 09:57:13 +0800
  • cc9626f438
    Merge pull request #962 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/underscore.string-3.3.5 xieyinglin 2019-12-20 09:55:45 +0800
  • 1cd00f0cfb
    Merge pull request #961 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/sshpk-1.16.1 xieyinglin 2019-12-20 09:54:49 +0800
  • 44478b1f51
    Merge pull request #960 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/lodash-4.17.13 xieyinglin 2019-12-20 09:52:50 +0800
  • 805f5a50b7
    Merge pull request #959 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/extend-3.0.2 xieyinglin 2019-12-20 09:50:30 +0800
  • 60f2df648f
    Bump underscore.string in /src/connector/grafana/tdengine dependabot[bot] 2019-12-20 01:38:33 +0000
  • cd092242a5
    Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine dependabot[bot] 2019-12-20 01:38:32 +0000
  • 23a6bee2d2
    Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine dependabot[bot] 2019-12-20 01:38:31 +0000
  • ef3f9bcdcd
    Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine dependabot[bot] 2019-12-20 01:38:31 +0000
  • 31ef0a7abd
    Merge pull request #957 from taosdata/feature/grafana_plugin slguan 2019-12-20 09:37:52 +0800
  • c47a3771c0 replace import dashboard image xieyinglin 2019-12-19 20:36:04 +0800
  • c7148e4e47 Merge branch 'develop' into feature/grafana_plugin xieyinglin 2019-12-19 20:03:27 +0800
  • d80af197d5 add support for custom template variable xieyinglin 2019-12-19 19:54:05 +0800
  • 0f06cbc5fd remove some warnings slguan 2019-12-19 19:13:38 +0800
  • 682bcb2d6d
    Merge pull request #955 from taosdata/master haojun Liao 2019-12-19 18:03:11 +0800
  • c8fff94537
    Merge pull request #954 from taosdata/feature/#928 haojun Liao 2019-12-19 17:50:43 +0800
  • 49df101592
    Merge pull request #953 from taosdata/feature/lihui haojun Liao 2019-12-19 17:49:39 +0800
  • ed942e8f1c #952 [TBASE-1356] slguan 2019-12-19 17:39:56 +0800
  • c159dd8ad7 [TBASE-1360] lihui 2019-12-19 17:37:30 +0800
  • 31ea35243f
    Merge pull request #950 from taosdata/feature/#928 haojun Liao 2019-12-19 17:25:08 +0800
  • 5741c02651 opt query performance. hjxilinx 2019-12-19 14:59:48 +0800
  • 399fa20915 refactor codes hjxilinx 2019-12-19 14:46:59 +0800
  • 96329ea18c #949 slguan 2019-12-19 14:09:03 +0800
  • a5805df141
    Merge pull request #947 from taosdata/hjxilinx-patch-2 slguan 2019-12-19 13:42:27 +0800
  • b9e05f05a7
    Merge pull request #948 from taosdata/feature/liaohj slguan 2019-12-19 13:42:05 +0800
  • 4c42be31b6 refactor code referred in issue #938 hjxilinx 2019-12-19 13:37:36 +0800
  • 897c23bd9a opt performance by removing the mmap operation hjxilinx 2019-12-19 13:33:12 +0800
  • 24d93f5729 opt performance by removing the mmap during read header file hjxilinx 2019-12-19 13:31:31 +0800
  • 50865d282e
    Update vnodeQueryImpl.c haojun Liao 2019-12-19 13:29:00 +0800
  • a935e645f1 fix bug in issue #946 [tbase-1363] hjxilinx 2019-12-19 13:23:14 +0800
  • 7f2061e9d0
    Merge pull request #943 from taosdata/hjxilinx-patch-1 slguan 2019-12-19 10:21:40 +0800
  • c3fc348645
    Merge pull request #942 from taosdata/feature/liaohj slguan 2019-12-19 10:21:32 +0800
  • c5e5f4c663
    Merge pull request #940 from taosdata/patch/errmsg slguan 2019-12-19 10:21:02 +0800
  • 827fad8210
    Merge pull request #944 from taosdata/feature/lihui fangpanpan 2019-12-18 18:37:57 +0800
  • 40fab98276 [TBASE-1162] plum-lihui 2019-12-18 17:59:17 +0800