Shengliang Guan
|
b5a86eedd2
|
Merge pull request #3346 from taosdata/fmaster/lihui
[TD-1305]
|
2020-09-02 13:43:44 +08:00 |
Hui Li
|
72199cacdf
|
[TD-1305]
|
2020-09-02 13:19:16 +08:00 |
|
Shengliang Guan
|
d85bb64c06
|
Merge pull request #3333 from taosdata/fmaster/lihui
[do not get version info using get_version.sh]
|
2020-09-01 17:51:17 +08:00 |
|
Hui Li
|
3e69309401
|
[do not get version info using get_version.sh]
|
2020-09-01 16:11:41 +08:00 |
|
Shengliang Guan
|
5251a7c15f
|
Merge pull request #3331 from taosdata/fmaster/lihui
[modify taosc name for oem power]
|
2020-09-01 15:54:20 +08:00 |
|
Hui Li
|
030d1fa459
|
[modify taosc name for oem power]
|
2020-09-01 15:40:20 +08:00 |
|
Hui Li
|
5ab467451d
|
[modify taosc name for oem power]
|
2020-09-01 15:19:20 +08:00 |
|
Shengliang Guan
|
f6d58a9049
|
Merge pull request #3328 from taosdata/fmaster/lihui
[del get version info from version.c]
|
2020-09-01 14:31:13 +08:00 |
|
Hui Li
|
9adf8d2676
|
[del get version info from version.c]
|
2020-09-01 14:03:39 +08:00 |
|
Shengliang Guan
|
d7eae8ef86
|
Merge pull request #3324 from taosdata/hotfix/os
compile error in windows
|
2020-09-01 11:51:59 +08:00 |
|
Shengliang Guan
|
1ca3e34d34
|
compile error in windows
|
2020-09-01 11:28:03 +08:00 |
|
Shengliang Guan
|
3856c67cca
|
Merge pull request #3308 from taosdata/fmaster/lihui
Fmaster/lihui
|
2020-09-01 09:48:30 +08:00 |
|
Hui Li
|
bc5e56517a
|
[TD-1256]
|
2020-08-31 17:30:59 +08:00 |
|
Hui Li
|
bd66367877
|
[del taosnetwork dir]
|
2020-08-31 17:26:51 +08:00 |
|
Hui Li
|
3e15d4616d
|
[TD-1256]
|
2020-08-31 17:26:03 +08:00 |
|
Hui Li
|
599760c6e3
|
[TD-1256]
|
2020-08-31 17:24:28 +08:00 |
|
Shengliang Guan
|
0372187961
|
Merge pull request #3301 from taosdata/fmaster/lihui
[modify oem macro define]
|
2020-08-31 13:53:07 +08:00 |
|
Hui Li
|
018feb4101
|
[TD-181]
|
2020-08-31 11:39:11 +08:00 |
|
Hui Li
|
8f57775923
|
[modify oem macro define]
|
2020-08-31 11:34:55 +08:00 |
|
Shengliang Guan
|
88960d5bb8
|
Merge pull request #3292 from taosdata/fmaster/lihui
Fmaster/lihui
|
2020-08-29 16:59:45 +08:00 |
|
Hui Li
|
934f2c473d
|
[TD-1228]
|
2020-08-29 16:16:02 +08:00 |
|
Hui Li
|
790c28f205
|
[TD-1228]
|
2020-08-29 16:07:53 +08:00 |
|
Hui Li
|
2aa54b4ec7
|
[TD-1228]
|
2020-08-29 16:04:41 +08:00 |
|
Hui Li
|
50e2dd7531
|
[TD-1228]
|
2020-08-29 15:46:50 +08:00 |
|
Hui Li
|
57ec385903
|
[TD-1228]
|
2020-08-29 15:45:02 +08:00 |
|
Shengliang Guan
|
29532ffff5
|
Merge pull request #3289 from taosdata/TD-1280_fix
Td 1280 fix
|
2020-08-29 15:09:30 +08:00 |
zyyang
|
8a455cfd82
|
update jdbc test cases
|
2020-08-29 13:52:57 +08:00 |
|
zyyang
|
3f09fcb0b0
|
change the jdbc test cases
|
2020-08-29 13:34:52 +08:00 |
|
Shengliang Guan
|
b0f219bf17
|
Merge pull request #3287 from taosdata/develop
Merge from develop into master
|
2020-08-28 20:47:03 +08:00 |
|
Shengliang Guan
|
70ff6014b4
|
Merge pull request #3285 from taosdata/hotfix/sync
Hotfix/sync
|
2020-08-28 18:23:49 +08:00 |
|
Shengliang Guan
|
feebfa626e
|
TD-1173 Invalid account permission settings
|
2020-08-28 08:31:51 +00:00 |
|
Shengliang Guan
|
46d0756242
|
Merge pull request #3284 from taosdata/feature/os
minor changes
|
2020-08-28 15:48:54 +08:00 |
|
Shengliang Guan
|
2420c8c5c6
|
minor changes
|
2020-08-28 15:48:03 +08:00 |
|
Shengliang Guan
|
d09567c82b
|
TD-1257
|
2020-08-28 06:42:05 +00:00 |
|
Shengliang Guan
|
88dc376ce5
|
Merge pull request #3281 from taosdata/feature/sangshuduo/add-a-badge-to-indicate-docker-pull-number
add docker repo link
|
2020-08-28 14:02:03 +08:00 |
|
Shengliang Guan
|
3e9834c907
|
Merge remote-tracking branch 'origin/develop' into hotfix/sync
|
2020-08-28 05:51:32 +00:00 |
Shuduo Sang
|
413a9a657e
|
add docker repo link
|
2020-08-28 13:41:01 +08:00 |
|
Shengliang Guan
|
4e944c3acc
|
Merge pull request #3280 from taosdata/feature/os
Feature/os
|
2020-08-28 13:17:13 +08:00 |
|
Shengliang Guan
|
332ae098c6
|
Merge remote-tracking branch 'origin/develop' into feature/os
|
2020-08-28 13:15:33 +08:00 |
|
Shengliang Guan
|
97d095af4a
|
Merge pull request #3279 from taosdata/master
Master
|
2020-08-28 13:14:01 +08:00 |
|
Shengliang Guan
|
b6c952d700
|
Merge pull request #3278 from taosdata/fmaster/lihui
[release version modify]
|
2020-08-28 13:12:46 +08:00 |
|
Shengliang Guan
|
28cef33a72
|
minor changes
|
2020-08-28 13:08:34 +08:00 |
|
Shengliang Guan
|
e16572e459
|
Merge remote-tracking branch 'origin/fmaster/lihui' into feature/os
|
2020-08-28 13:04:25 +08:00 |
|
Hui Li
|
89744f4ba8
|
[release version modify]
|
2020-08-28 13:00:53 +08:00 |
|
Shengliang Guan
|
ae8fbb6b21
|
TD-1090 compile error in windows
|
2020-08-28 11:57:40 +08:00 |
|
Shengliang Guan
|
50e73ebbce
|
Merge pull request #3277 from zwllxs/patch-1
Update administrator-ch.md
|
2020-08-28 10:35:18 +08:00 |
|
Shengliang Guan
|
9f158b9d48
|
minor changes
|
2020-08-28 10:28:12 +08:00 |
|
Shengliang Guan
|
9e97c25d3c
|
Merge pull request #3132 from taosdata/feature/query
Feature/query
|
2020-08-28 10:26:46 +08:00 |
zwllxs
|
5242848a82
|
Update administrator-ch.md
|
2020-08-28 10:06:01 +08:00 |
|
Shengliang Guan
|
90367ca788
|
TD-1257 mnode module startup check condition is wrong
|
2020-08-27 15:21:37 +00:00 |