Commit Graph

2297 Commits

Author SHA1 Message Date
Hongze Cheng e8d96d437e more 2020-02-11 15:29:08 +08:00
Bomin Zhang f8f4fd45cd
Merge pull request #1210 from taosdata/feature/lihui
[add wechat]
2020-02-11 14:19:39 +08:00
lihui 9d86517cb0 [add wechat] 2020-02-11 14:04:25 +08:00
Hongze Cheng c36491c19c more 2020-02-11 11:19:34 +08:00
slguan 953be7eb5f
Merge pull request #1206 from taosdata/feature/liaohj
Feature/liaohj
2020-02-11 10:57:39 +08:00
slguan 1bb9ac5a1f
Merge pull request #1209 from taosdata/feature/lihui
[BASE-1513]
2020-02-11 10:56:27 +08:00
lihui bd304d0e01 [BASE-1513] 2020-02-11 10:36:55 +08:00
lihui a926ffd33f [BASE-1513] 2020-02-11 10:21:57 +08:00
Hongze Cheng ded484b5cd Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-10 22:10:31 +08:00
Hongze Cheng aefd622e1e more 2020-02-10 22:10:00 +08:00
slguan 4714101918 tstatus.h 2020-02-10 21:34:09 +08:00
slguan e65cd29640 rename mgmtMeter.c to mgmtTable.c 2020-02-10 21:16:22 +08:00
slguan 31f8cf3ff5 Organize mgmtUtil.c file 2020-02-10 21:15:37 +08:00
tanxuefeng dafdb50fcf atomic type error 2020-02-10 20:48:48 +08:00
slguan d97941aacf rename from meter to table 2020-02-10 20:43:19 +08:00
T_MAX 5d68b27311
Merge pull request #1 from taosdata/develop
合并
2020-02-10 20:00:57 +08:00
slguan fd424455ff Merge branch 'develop' into 2.0 2020-02-10 19:58:19 +08:00
slguan 53ef820cc7 rename from mgmt.h to mnode.h 2020-02-10 19:52:22 +08:00
slguan 75457192b8 move *.h from src/inc to src/util/inc 2020-02-10 19:50:01 +08:00
Bomin Zhang df6b88ab23 Merge pull request #1207 from taosdata/feature/lihui
[modify default for aarch32]
2020-02-10 16:25:44 +08:00
huili 029c852e33 [modify describe arm] 2020-02-10 16:24:36 +08:00
plum-lihui bea55c4246 Merge pull request #1205 from taosdata/beta/v1.6.6.0
for windows compile
2020-02-10 16:12:15 +08:00
huili bcda954fb5 [modify default for aarch32] 2020-02-10 16:09:32 +08:00
hjxilinx 3b334b0a72 Merge branch 'develop' into feature/liaohj 2020-02-10 15:22:20 +08:00
hjxilinx 5517322290 fix bugs found in regression test. 2020-02-10 15:20:00 +08:00
slguan 0e6dfe292a for windows compile 2020-02-10 11:43:48 +08:00
plum-lihui e7bc44baa5
Merge pull request #1204 from taosdata/beta/v1.6.6.0
for windows compile
2020-02-10 10:50:51 +08:00
slguan b581aaf164 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-10 08:56:49 +08:00
hjxilinx 79b0ff88fb fix query bugs. 2020-02-10 03:28:11 +08:00
hjxilinx fbe202ce41 fix bugs in regression test. 2020-02-10 00:08:01 +08:00
hjxilinx 23b2c91727 fix sliding set bug. 2020-02-09 22:44:52 +08:00
slguan 8cb0846544 #1177 2020-02-09 22:34:57 +08:00
slguan 11e82045d9 for windows compile 2020-02-09 22:27:15 +08:00
Bomin Zhang 1d49be652e
Merge pull request #1203 from taosdata/feature/lihui
[#1201]
2020-02-09 18:48:21 +08:00
huili 58c9fafab6 [#1201] 2020-02-09 18:39:00 +08:00
hjxilinx 5f45a1d6ba refactor codes 2020-02-09 17:18:48 +08:00
hjxilinx 51b0ffd5f2 refactor codes 2020-02-09 17:17:35 +08:00
hjxilinx 5c8b408a9a refactor codes 2020-02-09 17:11:19 +08:00
hjxilinx d1f5edb65e refactor codes 2020-02-09 17:06:22 +08:00
hjxilinx 2129bc1e56 refactor codes 2020-02-09 17:02:59 +08:00
Bomin Zhang 4ab60b2e2a Merge pull request #1202 from taosdata/feature/lihui
Feature/lihui
2020-02-09 16:50:24 +08:00
huili f9f349551a [#1201] 2020-02-09 16:43:40 +08:00
huili 2b1947feb8 Merge branch 'develop' into feature/lihui 2020-02-09 16:40:17 +08:00
Hongze Cheng 2da826f955 more 2020-02-09 14:58:06 +08:00
Bomin Zhang d4894c9f03 Merge pull request #1200 from taosdata/feature/lihui
Feature/lihui
2020-02-09 12:30:01 +08:00
lihui 69bbb5fcbb [#1199] 2020-02-09 12:19:03 +08:00
lihui 6c99896f85 Merge branch 'feature/lihui' of https://github.com/taosdata/TDengine into feature/lihui 2020-02-09 12:13:07 +08:00
lihui 842bdc50c6 [modify pkg name] 2020-02-09 12:07:59 +08:00
huili a08f5e878b Merge branch 'develop' into feature/lihui 2020-02-09 08:53:13 +08:00
slguan 473586ef77 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-08 20:45:03 +08:00