Commit Graph

27626 Commits

Author SHA1 Message Date
Bomin Zhang 772cd18fbe
Merge pull request #1218 from taosdata/feature/lihui
[TBASE-1462]
2020-02-12 15:25:25 +08:00
lihui 87efc517bf [TBASE-1462] 2020-02-12 15:12:22 +08:00
plum-lihui 17f1da3339
Merge pull request #1217 from taosdata/feature/dockerfile
Feature/dockerfile
2020-02-12 14:41:21 +08:00
liu0x54 bad1e7e7b8 modify minidevops readme 2020-02-12 14:36:34 +08:00
liu0x54 a49018afb5 modify minidevops readme 2020-02-12 14:32:45 +08:00
Hongze Cheng 472d52a275 add more 2020-02-12 14:32:18 +08:00
liu0x54 f4dac146dc modify the dockerfile and docker build script to adapt the change of software release script 2020-02-12 14:23:15 +08:00
Jeff Tao 5b4c77e34d
Merge pull request #1208 from huskar-t/develop
pHeader->tranId use the wrong method when assigning
2020-02-12 12:46:09 +08:00
slguan 7046203557 split meter to table and stable 2020-02-12 12:46:01 +08:00
slguan 84223033ae
Merge pull request #1215 from taosdata/feature/lihui
[#1212]
2020-02-12 11:53:20 +08:00
slguan 479e7f5577
Merge pull request #1211 from sangshuduo/fix-mac-build-for-tpercentile-link
fix tpercentile link issue on Mac (and Windows)
2020-02-12 11:52:45 +08:00
lihui 7e05c1bd8b [#1212] 2020-02-12 11:44:36 +08:00
xieyinglin e5988e54ef
Merge pull request #1214 from taosdata/feature/lihui
[#1212]
2020-02-12 11:41:47 +08:00
lihui 2bb78227e2 [#1212] 2020-02-12 11:40:11 +08:00
lihui f455f9c280 [#1212] 2020-02-12 11:35:14 +08:00
slguan 44a099b5ab confilct 2020-02-12 10:53:54 +08:00
slguan 7540c92f01 Merge branch 'develop' into 2.0
# Conflicts:
#	src/system/CMakeLists.txt
#	src/system/detail/CMakeLists.txt
#	src/system/lite/CMakeLists.txt
#	src/util/inc/textbuffer.h
#	src/vnode/detail/inc/vnodeTagMgmt.h
#	src/vnode/detail/src/vnodeQueryImpl.c
#	src/vnode/detail/src/vnodeSupertableQuery.c
2020-02-12 10:50:12 +08:00
xieyinglin b56de119b5
Merge pull request #1213 from taosdata/feature/lihui
[#1212]
2020-02-12 10:01:28 +08:00
lihui 81a96b38e4 [#1212] 2020-02-12 09:57:04 +08:00
Hongze Cheng e90eb2d613 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-11 22:15:42 +08:00
Hongze Cheng 4ecdb6d5b1 more 2020-02-11 22:15:27 +08:00
slguan 74039b30dc #1177 2020-02-11 18:26:28 +08:00
slguan 3b269e00f3 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-11 18:15:22 +08:00
Hongze Cheng 8676d969c7 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-11 17:31:34 +08:00
Hongze Cheng bf5586b4de more 2020-02-11 17:31:19 +08:00
Shuduo Sang 047acd91af fix tpercentile link issue on Mac (and Windows) 2020-02-11 17:06:59 +08:00
slguan c6dbaa8274 #1177 2020-02-11 15:51:56 +08:00
slguan 403a25b1b1 Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0 2020-02-11 15:48:15 +08:00
slguan 9427e9d8d4 sort out mnode 2020-02-11 15:48:08 +08:00
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