Commit Graph

  • f06e25fe1a Merge branch 'develop' into feature/mergeimport Hongze Cheng 2019-11-29 15:24:51 +0800
  • 92e5e239f6 refact more Hongze Cheng 2019-11-29 15:15:28 +0800
  • a51d109adb refact part of code Hongze Cheng 2019-11-29 14:28:03 +0800
  • a27fcc52b8 refactor part of code Hongze Cheng 2019-11-29 11:50:15 +0800
  • 56bb3121ad refactor part of code Hongze Cheng 2019-11-29 10:19:08 +0800
  • 6fabe650af change var name Hongze Cheng 2019-11-29 09:39:18 +0800
  • a5a1b0ee95 Merge branch 'develop' into feature/slguan slguan 2019-11-28 22:51:26 +0800
  • 1353cff064 fix issue #626 and [TBASE-1192] slguan 2019-11-28 22:45:35 +0800
  • 63a5d22320 fix issue #626 and [TBASE-1192] slguan 2019-11-28 22:29:30 +0800
  • 27215b3452 [TBASE-1258] slguan 2019-11-28 21:58:12 +0800
  • 118861cee1 fix issue #626 and [TBASE-1192] slguan 2019-11-28 21:21:08 +0800
  • 4aa9c7adc9 change long back to int64_t Hongze Cheng 2019-11-28 17:07:28 +0800
  • dd4f909f42
    Merge pull request #797 from taosdata/feature/liaohj slguan 2019-11-28 16:26:28 +0800
  • 3a30848e0b
    Merge pull request #796 from taosdata/feature/slguan haojun Liao 2019-11-28 16:17:19 +0800
  • 96ae0ca224 [jira none]only open and memory map one group of files hjxilinx 2019-11-28 16:15:08 +0800
  • 8254aba18a Merge branch 'feature/slguan' of https://github.com/taosdata/TDengine into feature/slguan slguan 2019-11-28 14:40:35 +0800
  • 4512cf6a16 [TBASE-1252] slguan 2019-11-28 14:22:57 +0800
  • f7d21f6c2c
    Merge pull request #795 from taosdata/feature/liaohj slguan 2019-11-28 12:50:00 +0800
  • 07a670027b [jira none] hjxilinx 2019-11-28 12:02:32 +0800
  • 19ceadd6b2 [jira none] hjxilinx 2019-11-28 11:59:45 +0800
  • 38558450ba
    Merge pull request #793 from taosdata/feature/liaohj slguan 2019-11-28 10:57:42 +0800
  • 4466964afc [jira none] hjxilinx 2019-11-28 10:56:06 +0800
  • 14c9d204f9 [jira none] hjxilinx 2019-11-28 10:46:20 +0800
  • 99c6d1ec04 Merge branch 'develop' into feature/mergeimport Hongze Cheng 2019-11-28 10:44:58 +0800
  • 7ed65adbd8
    Merge pull request #791 from taosdata/feature/lihui Bomin Zhang 2019-11-28 10:39:26 +0800
  • e3edfccac0 [TBASE-1256] lihui 2019-11-28 10:36:30 +0800
  • 178bddaf85
    Merge pull request #790 from taosdata/feature/lihui slguan 2019-11-27 19:38:45 +0800
  • b74766ab31 [TBASE-898] lihui 2019-11-27 19:35:11 +0800
  • b9caf79b31
    Merge pull request #789 from taosdata/feature/liaohj slguan 2019-11-27 19:32:20 +0800
  • 3078b00872 Merge branch 'develop' into feature/liaohj hjxilinx 2019-11-27 19:30:33 +0800
  • 3b97e52cd6 [jira none] hjxilinx 2019-11-27 19:29:28 +0800
  • b964a595b4
    Merge pull request #788 from taosdata/feature/lihui slguan 2019-11-27 19:21:45 +0800
  • 6489482064 [TBASE-898] lihui 2019-11-27 19:19:45 +0800
  • 8be1568dfb Merge branch 'develop' into feature/lihui lihui 2019-11-27 19:18:00 +0800
  • 8835fa9d05
    Merge pull request #787 from taosdata/feature/liaohj slguan 2019-11-27 19:11:40 +0800
  • 0c0c7e271d [jira none] hjxilinx 2019-11-27 19:09:36 +0800
  • 279ac97029
    Merge pull request #785 from taosdata/feature/detect-mem-leak slguan 2019-11-27 18:56:15 +0800
  • 574f9d4c74
    Merge pull request #786 from taosdata/feature/liaohj slguan 2019-11-27 18:53:31 +0800
  • f0b93abbde [tbase-874] hjxilinx 2019-11-27 18:47:59 +0800
  • 7570c7ff70
    Merge pull request #784 from taosdata/feature/slguan haojun Liao 2019-11-27 18:36:44 +0800
  • a68ca3f031 Merge branch 'develop' into feature/slguan slguan 2019-11-27 18:29:50 +0800
  • 5bec721de7 [TBASE-1229] slguan 2019-11-27 16:05:38 +0800
  • 45ec74b6e1 remove some logs slguan 2019-11-27 15:56:12 +0800
  • 40c1d4d4b0 Merge branch 'develop' into feature/lihui lihui 2019-11-27 13:07:26 +0800
  • e39bd6793b
    Merge pull request #780 from taosdata/feature/lihui fangpanpan 2019-11-27 13:06:58 +0800
  • ad979353bd [NONE] lihui 2019-11-27 13:03:34 +0800
  • 3d59166816
    Merge pull request #779 from taosdata/feature/slguan haojun Liao 2019-11-27 10:08:53 +0800
  • 495bb3094b Merge branch 'develop' into feature/slguan slguan 2019-11-27 09:45:25 +0800
  • 903b88a5e1
    Merge pull request #777 from taosdata/feature/lihui slguan 2019-11-26 22:53:05 +0800
  • 8c2ecd3e98
    Merge pull request #776 from taosdata/feature/liaohj slguan 2019-11-26 22:52:04 +0800
  • bb4cdad92c Handle syntax errors in windows compilation slguan 2019-11-26 22:45:07 +0800
  • 2f0ab1ac86 version.c slguan 2019-11-26 21:57:29 +0800
  • d9aa3d519c add the config option in the taos.cfg file hjxilinx 2019-11-26 21:34:18 +0800
  • fcd1316531 [TBASE-1229] slguan 2019-11-26 19:26:32 +0800
  • b0f2738ebe [TBASE-1229] slguan 2019-11-26 19:10:40 +0800
  • f73aaccb57 [TBASE-570] lihui 2019-11-26 18:30:40 +0800
  • b419d1a0b0 [TBASE-1246] slguan 2019-11-26 18:17:38 +0800
  • ed253f2a2a fix a small bug Hongze Cheng 2019-11-26 17:47:29 +0800
  • 178f5771f6 [jira none] hjxilinx 2019-11-26 17:27:30 +0800
  • 62971c0c03 [TBASE-1229] slguan 2019-11-26 17:03:51 +0800
  • 0509744973 [jira none] refactor codes hjxilinx 2019-11-26 16:19:31 +0800
  • fbe9b5f852 [tbase-933] hjxilinx 2019-11-26 14:30:36 +0800
  • 0ba6a7cdbf Merge branch 'develop' into feature/mergeimport Hongze Cheng 2019-11-26 10:06:40 +0800
  • 9f18522556 Merge branch 'develop' into feature/slguan slguan 2019-11-26 09:16:56 +0800
  • bb5a0f8241
    Merge pull request #771 from taosdata/feature/liaohj slguan 2019-11-26 09:14:37 +0800
  • befbfcc06a [TBASE-1236] slguan 2019-11-25 22:27:25 +0800
  • a48c13aaf1 [tbase-1225] hjxilinx 2019-11-25 18:06:37 +0800
  • a3464134c8 fix small bug Hongze Cheng 2019-11-25 17:42:39 +0800
  • cdaa3871a1 refactor code hjxilinx 2019-11-25 17:22:17 +0800
  • 72ce043d35
    Merge pull request #770 from taosdata/feature/liaohj slguan 2019-11-25 16:27:37 +0800
  • aceeed3b01 [tbase-1007] hjxilinx 2019-11-25 16:21:05 +0800
  • 7d1da2127f a quick fix Hongze Cheng 2019-11-25 15:37:37 +0800
  • 40617f5dd1
    Merge pull request #769 from taosdata/feature/slguan haojun Liao 2019-11-25 15:29:37 +0800
  • 50c507c870 refactor error code return Hongze Cheng 2019-11-25 15:25:04 +0800
  • b96fdff863 Merge branch 'develop' into feature/slguan slguan 2019-11-25 15:05:16 +0800
  • ac2ea8b4d0
    Merge pull request #768 from taosdata/feature/liaohj slguan 2019-11-25 15:04:28 +0800
  • db8f5a849d [TBASE-1235] slguan 2019-11-25 14:58:59 +0800
  • af036b8776 [TBASE-1235] slguan 2019-11-25 14:45:29 +0800
  • 22619e2d55 Merge branch 'develop' into feature/liaohj hjxilinx 2019-11-25 13:31:28 +0800
  • cbf8014c76 Merge branch 'develop' into feature/slguan slguan 2019-11-25 13:27:27 +0800
  • edd7ce2213 add error code if the query msg is not valid hjxilinx 2019-11-25 13:24:13 +0800
  • 6c2cf34693 refactor some codes. hjxilinx 2019-11-25 13:23:05 +0800
  • 534aa8b11d fix modification error Hongze Cheng 2019-11-25 10:04:48 +0800
  • 0e9e6beee9
    Merge pull request #767 from taosdata/hotfix/tbase-1233 plum-lihui 2019-11-25 09:43:36 +0800
  • 0457d50708 [TBASE-1228] slguan 2019-11-25 09:40:29 +0800
  • 69c8df7119 fix tbase-1233: go connector cause client crash localvar 2019-11-25 09:37:20 +0800
  • 5e007a8e3e [TBASE-1230] slguan 2019-11-24 19:48:46 +0800
  • 960aae4f09 [TBASE-1218] slguan 2019-11-23 22:42:31 +0800
  • cab25efd34
    Merge pull request #763 from stevel032/github/761 fangpanpan 2019-11-23 17:55:40 +0800
  • 528b601287 Fix TBASE-1114 Hongze Cheng 2019-11-23 17:07:43 +0800
  • 00a8a0bd35
    Merge pull request #766 from taosdata/feature/lihui slguan 2019-11-23 15:28:10 +0800
  • 27657f2eb4 [TBASE-1215 ROLLBACK] lihui 2019-11-23 15:26:33 +0800
  • 91cd701d4d
    Merge pull request #765 from taosdata/feature/slguan haojun Liao 2019-11-23 13:56:33 +0800
  • be99073f3f
    Merge pull request #764 from taosdata/feature/lihui haojun Liao 2019-11-23 13:55:20 +0800
  • 11370c913f [TBASE-1128] slguan 2019-11-23 13:47:43 +0800
  • 6eeb797cb3 [TBASE-1215] lihui 2019-11-23 11:59:27 +0800
  • 30773c4ed2 [TBASE-1215] lihui 2019-11-23 11:30:11 +0800
  • 553df7ff5c
    Merge pull request #762 from taosdata/feature/slguan haojun Liao 2019-11-23 11:00:33 +0800
  • b7ba65c3c1 Partial fix of #761, corrected bad characters Steven Li 2019-11-22 18:47:04 -0800
  • 1414e2ee10 [TBASE-1221] slguan 2019-11-23 09:44:37 +0800