Commit Graph

899 Commits

Author SHA1 Message Date
slguan ac19d3726e fix add mnode error 2020-04-22 12:14:50 +08:00
slguan 69a559164a add dnode offline timer 2020-04-22 10:59:27 +08:00
slguan d099ab73b9 remove un necessary vload 2020-04-21 23:21:13 +08:00
slguan 8e444435d1 [TD-150] save vnode cfg use json format 2020-04-21 21:43:11 +08:00
slguan 273cc32249 [TD-148] change ip sets 2020-04-21 13:27:03 +08:00
slguan db21aead76 [TD-148] fix redirect message 2020-04-21 11:45:49 +08:00
slguan def56681b8 [TD-148] add test scripts 2020-04-20 23:40:45 +08:00
slguan d4a9959ef3 [TD-52] change show mnodes meta 2020-04-20 19:22:04 +08:00
slguan 80fe2e00a7 [TD-52] fix error while syncing 2020-04-20 17:14:44 +08:00
slguan 1774b5623b [TD-68] [TD-69] refactor tlog 2020-04-19 22:29:37 +08:00
slguan a09dac9439 [TD-52] refactor sdb write codes 2020-04-18 22:04:18 +08:00
slguan c0f69556d8 merge from wal 2020-04-18 12:09:45 +08:00
slguan a1c8ec36bb [TD-52] fix bug in sdb sync 2020-04-17 21:04:43 +08:00
slguan ecc95e7054 set master when there is only one node 2020-04-17 13:10:54 +08:00
slguan 84fc0e3a96 fix compile error 2020-04-17 12:21:16 +08:00
slguan 0732786632 [TD-52] refactor interface 2020-04-17 12:18:28 +08:00
slguan c2067ab4cd fix status message error 2020-04-17 00:31:33 +08:00
slguan 19b1d449de rearrange code directory 2020-04-17 00:07:09 +08:00
slguan 0f202d9fc4 rearrage some codes 2020-04-16 18:57:13 +08:00
slguan fe12d0fe11 add cluster codes 2020-04-16 17:17:03 +08:00
slguan d255b599f5 change table meta 2020-04-16 13:47:10 +08:00
slguan de76b5bd30 change super table vgroup 2020-04-16 13:31:56 +08:00
slguan d7d51ad10b Merge remote-tracking branch 'origin/develop' into feature/mpeer 2020-04-16 12:49:16 +08:00
slguan c29c7f1c4c add vgroup list to stable 2020-04-16 12:49:04 +08:00
hjxilinx 6a504d3647 Merge branch 'develop' into feature/query 2020-04-16 11:20:17 +08:00
hjxilinx 130d4cd20c [td-98] add the group by support for super table query 2020-04-16 11:08:39 +08:00
slguan a3d4443a8b [TD-52] modify updatefp in sdb 2020-04-16 10:34:00 +08:00
slguan 98286acce4 fix possible memory lost 2020-04-15 21:34:13 +08:00
slguan a5d0e01ab4 fix error in sdb 2020-04-15 20:18:15 +08:00
slguan cc52d293ef fix error while sync sdb 2020-04-15 15:09:47 +08:00
slguan a7e1c7cec6 [TD-52] refactor sdb codes 2020-04-14 23:33:22 +08:00
slguan 0e146b7884 Merge branch 'develop' into feature/mpeer 2020-04-14 16:39:14 +08:00
slguan b286a296bf [TD-52] first version mpeer 2020-04-14 16:38:15 +08:00
slguan dd7e295269
Merge pull request #1608 from taosdata/feature/query
Feature/query
2020-04-14 11:47:00 +08:00
slguan 1fb5a8c2fd fix some memory lost 2020-04-14 00:01:31 +08:00
slguan 5b33531389 [TD-52] refact sdb code 2020-04-13 23:14:25 +08:00
slguan 34a3ac2436 [TD-52] make sdb use wal 2020-04-13 19:25:38 +08:00
hjxilinx f5a1ac4b48 [td-98]fix bugs in descending order query for tables 2020-04-12 21:46:34 +08:00
slguan 71607ccb8b [TD-52] update status message 2020-04-11 16:39:11 +08:00
slguan 78f7134ef1 [TD-52] rename some defs 2020-04-11 00:09:37 +08:00
slguan ed2254dbcc [TD-114] let create table wait until master selected 2020-04-10 14:09:50 +08:00
slguan f87b68d9a8 Merge branch 'develop' into feature/balance 2020-04-09 16:17:35 +08:00
slguan d5de8dc1e3 [TD-82] fix error while balance 2020-04-09 16:15:21 +08:00
slguan d860ec1b86
Merge pull request #1553 from taosdata/feature/query
[td-98] support iplist
2020-04-09 15:50:19 +08:00
slguan 4f350284ab [TD-82] first edition of balance 2020-04-08 23:36:37 +08:00
slguan 8568f4c461 [TD-82] refactor balance module 2020-04-08 20:02:29 +08:00
Shuduo Sang a7aa4e1e5f fix missing mutex-unlock call in few files.
[TD-121]
2020-04-08 19:19:24 +08:00
slguan 76d4cdf869 Merge remote-tracking branch 'origin/develop' into feature/balance 2020-04-08 12:43:47 +08:00
slguan c536cdd39c [TD-114] add wal config 2020-04-08 12:24:32 +08:00
slguan cfd3eb2f8a [TD-114] 2020-04-08 09:54:52 +08:00
hjxilinx 44620e056c [td-98] support iplist 2020-04-07 15:57:48 +08:00
Shuduo Sang 77c6f616f9 add compile flag to treat all warnings as errors.
[TD-118]
2020-04-07 14:39:31 +08:00
slguan d87de41a77 fix warnings 2020-04-06 23:59:18 +08:00
slguan 8c4747e81d [TD-114] add balance interface, so it can create database with replica 2 option 2020-04-06 23:52:43 +08:00
slguan 445cdc2d8b [TD-114] save vnode cfg into config file 2020-04-06 20:24:37 +08:00
slguan 9e0b9fd2a9 fix warnings 2020-04-06 17:55:21 +08:00
slguan d6cda29863 pass clog parameters to dnode 2020-04-06 10:49:45 +08:00
slguan 9fa0685a24 [TD-93] fix deadlocks in dnode 2020-04-05 18:40:18 +08:00
slguan fb56f9dce7 Merge remote-tracking branch 'origin/develop' into refactor/cluster 2020-04-05 18:06:31 +08:00
slguan f5c561aaea
Merge pull request #1526 from taosdata/feature/query
Feature/query
2020-04-05 18:02:41 +08:00
hjxilinx d8aa6d9355 [TD-98] suppress compiler warnings and fix some typo 2020-04-05 15:50:41 +08:00
slguan 158cf67343 [TD-93] sort out error codes 2020-04-05 15:05:54 +08:00
slguan 851ebaac3e refactor code directory 2020-04-05 09:46:51 +08:00
slguan f9876dd76c
Merge pull request #1521 from taosdata/feature/query
[TD-98] fix memory leaks and invalid write
2020-04-05 08:37:15 +08:00
slguan c4b6bfd922 [TD-93] fix compile error 2020-04-05 08:32:16 +08:00
hjxilinx 93bd14716c [TD-98] fix memory leaks and invalid write 2020-04-05 01:14:37 +08:00
slguan e8b77d3b1a [TD-73] add some scripts 2020-04-04 18:30:19 +08:00
slguan 0183aa41ac fix error while get meta 2020-04-04 17:09:08 +08:00
slguan b58f945982 [TD-17] 2020-04-04 16:44:25 +08:00
slguan 709090488b [TD-17] fix comlile error 2020-04-04 14:36:02 +08:00
slguan 0f29af4a03 fix invalid error in dnode write 2020-04-04 14:04:30 +08:00
slguan 7f43265b83 Merge branch 'develop' into refactor/cluster 2020-04-04 13:15:27 +08:00
slguan d2effbaed7 fix compile errors 2020-04-04 13:14:33 +08:00
slguan 2d149dae64 [TD-73] fix error in table 2020-04-04 13:11:21 +08:00
slguan aeac5f9ea8 [TD-73] fix bug in refcount 2020-04-04 12:12:06 +08:00
slguan 26186e7fa1 [TD-93] revert some codes 2020-04-04 09:17:05 +08:00
slguan 64f57318d2 [TD-93] add ref to sdb 2020-04-03 22:46:30 +08:00
slguan 2a41cd2136 [TD-93] add ref to sdb 2020-04-03 22:33:57 +08:00
slguan 75b1576024 [TD-93] add ref to sdb 2020-04-03 21:04:42 +08:00
slguan eb6f21bdf9 [TD-93] add ref to sdb 2020-04-03 16:09:48 +08:00
slguan 07fe4defd4 [TD-93] add ref to users 2020-04-03 14:20:57 +08:00
slguan e068bf335b [TD-93] add ref to sdb 2020-04-03 12:45:03 +08:00
slguan 18da95ad90 Merge branch 'develop' of https://github.com/taosdata/TDengine into develop 2020-04-02 17:50:40 +08:00
slguan c06fb4d927 [TD-17] add show mnodes command in cluster version 2020-04-02 17:50:02 +08:00
hjxilinx e2b6fb280c [td-32] 2020-04-02 11:40:32 +08:00
slguan 61b2342b05 [TD-17] fix error while alloc vnodes 2020-04-02 11:00:00 +08:00
slguan 7330301f5b [TD-17] fix error while alloc vnodes 2020-04-01 17:43:10 +08:00
slguan 311c56c1d7 [TD-63] fix bug in grant module 2020-04-01 12:28:03 +08:00
slguan 78031df22c [TD-16] 2020-03-31 19:42:15 +08:00
slguan 107518ee8c [TD-17] 2020-03-31 17:50:49 +08:00
slguan 16710ace8f [TD-73] add tsim program 2020-03-31 00:34:35 +08:00
slguan 10485e3396 [TD-17] make cluster can be compiled 2020-03-30 18:18:05 +08:00
slguan ecae31bbbf Merge branch '2.0' into refact/slguan
# Conflicts:
#	src/vnode/detail/src/vnodeUtil.c
2020-03-30 17:28:47 +08:00
slguan 86e4ebcd83 [TD-17] make cluster can be compiled 2020-03-30 17:27:01 +08:00
slguan 86dc34fe16 [TD-63] finx link errors 2020-03-29 18:12:57 +08:00
slguan 306fde55fd [TD-63] [TD-61] change the interface of acct and grant 2020-03-29 17:45:40 +08:00
slguan 63f825a7e6 [TD-61] 2020-03-27 15:06:31 +08:00
slguan f1f30749e2 [TD-63] 2020-03-27 15:06:20 +08:00
hjxilinx c269b6d474 [TD-32] fix error in retrieve data 2020-03-27 01:59:26 +08:00
slguan 9961bf3332 [TD-16] change account codes 2020-03-27 00:38:00 +08:00
slguan 7c89da9864 [TD-16] 2020-03-27 00:27:38 +08:00
slguan 0d4852ca0e [TD-58] 2020-03-27 00:26:08 +08:00
hjxilinx f629aee1c7 [TD-32] fix error in retrieve data from table created according to stable 2020-03-26 14:15:15 +08:00
slguan 021d4b4240 [TD-9] error while create child table 2020-03-26 12:09:22 +08:00
slguan 6f65c5a961 [TD-9] error while get metadata 2020-03-26 11:22:06 +08:00
slguan 66de5c58c9 [TD-9] fix crash while create table 2020-03-26 10:09:19 +08:00
slguan b6313b346f [TD-9] fix compile errors 2020-03-26 01:01:52 +08:00
slguan 2180f6eb0f [TD-9] merge normal table with child table 2020-03-26 00:20:40 +08:00
slguan e1fdc40fe2 [TD-15] fix error while create child table 2020-03-25 11:01:07 +08:00
slguan 1a048a1028 [TD-9] extract table name 2020-03-25 00:04:58 +08:00
slguan 1a52be002f [TD-9] update show tables’ tableId len 2020-03-24 23:54:22 +08:00
slguan c541d35462 [TD-15] sdb may crash while received close signal 2020-03-24 15:34:22 +08:00
slguan d2e3ed8b7d [TD-15] refact code of sdb 2020-03-24 12:49:22 +08:00
slguan 51171c75de [TD-15] 2020-03-23 22:58:09 +08:00
slguan 00e18b70d7 [TD-15] refact code of tidpool 2020-03-23 19:07:57 +08:00
slguan 4271952dea [TD-15] refact the code to delete the database 2020-03-23 15:52:56 +08:00
slguan ddd05d9ccd Merge branch '2.0' into refact/slguan 2020-03-23 09:57:55 +08:00
slguan 2e3e7f3240 [TD-15] fix sdb error while delete user 2020-03-23 00:05:02 +08:00
slguan d93d1093b8 [TD-15] refact the interface of sdb 2020-03-22 10:12:41 +08:00
slguan a7040bed89
Merge pull request #1398 from taosdata/liaohj_2
[td-32] fix bugs in inserting data
2020-03-21 23:32:19 +08:00
hjxilinx 50705f3d11 [td-32] fix bugs in inserting data 2020-03-21 23:18:46 +08:00
slguan b0385c7a17 [TD-10] fix bug while numOfTotalVnodes not set 2020-03-21 23:08:38 +08:00
slguan 47029bc349 Merge branch '2.0' into refact/slguan
# Conflicts:
#	src/mnode/src/mgmtChildTable.c
#	src/mnode/src/mgmtDb.c
#	src/mnode/src/mgmtMnode.c
#	src/mnode/src/mgmtVgroup.c
2020-03-21 11:56:22 +08:00
hjxilinx f19c974227 [td-32] fix compile error 2020-03-21 11:34:07 +08:00
hjxilinx b87ac4ab24 [td-32] merge code 2020-03-21 11:16:09 +08:00
slguan d0b0ac956e [TD-15] fix bug in sdbInsertRow 2020-03-20 23:18:00 +08:00
slguan eb6764be24 [TD-15] refactor sdb 2020-03-20 18:13:03 +08:00
slguan e9a07987fd [TD-15] refactor sdb 2020-03-20 15:09:01 +08:00
slguan 4b7e463be8 [TD-15] refactor sdb 2020-03-19 23:29:29 +08:00
hjxilinx 5d4f826b7b [TD-32] fix bugs in get table meta (parsing query sql) 2020-03-19 22:06:50 +08:00
slguan 75bd0ebafe [TD-15] move sdb to mnode module 2020-03-19 21:12:09 +08:00
hjxilinx 9f8178d048 [TD-32] refactor the table meta 2020-03-19 16:08:08 +08:00
hjxilinx 06e89a5eef [TD-32] refactor the tablemeta 2020-03-19 14:36:01 +08:00
slguan 4662cff5c5 [TD-9] fix status bug in mnode 2020-03-19 14:01:52 +08:00
slguan 0e05f4ac0e [TD-9] fix errors in status message 2020-03-19 11:33:06 +08:00
slguan 7a96a2f325 [TD-9] change dnode privateip to dnode id 2020-03-19 10:08:02 +08:00
hjxilinx 03346d0ccc [TD-32] refactor the tablemeta 2020-03-18 22:47:20 +08:00
slguan 053280da8a [TD-10] add dnode status message 2020-03-18 17:31:52 +08:00
slguan 2a3c43abde [TD-10] change some log format 2020-03-17 19:22:30 +08:00
slguan 562967f1bd [TD-9] add code for drop database 2020-03-16 22:26:44 +08:00
slguan 13b5cd4c3a [TD-10] fix bugs while drop normal table 2020-03-16 15:28:01 +08:00
slguan 58118cfa39 [TD-10] drop stable message 2020-03-16 14:14:12 +08:00
slguan 63d2e696d2 [TD-9] refact create table msg 2020-03-15 22:07:50 +08:00
slguan ab805d418e [TD-10] refact create table 2020-03-15 21:08:51 +08:00
slguan b23c4cd1c2 [TD-10] fix error while parse schema 2020-03-15 09:20:58 +08:00
slguan d7e96770f1 [TD-10] pass tag values 2020-03-15 01:03:03 +08:00
slguan 5085e45815 Merge branch '2.0' into refact/slguan 2020-03-14 23:46:34 +08:00
slguan be08d243e3 [TD-10] add codes for create table 2020-03-14 23:46:08 +08:00
hjxilinx 0cd2043cfd refactor codes. 2020-03-14 18:43:07 +08:00
hjxilinx 0b0c1f2828 Merge branch '2.0' into liaohj_2 2020-03-14 18:09:21 +08:00
hjxilinx 80217813fd file rename, move query functions to different module. 2020-03-14 18:05:42 +08:00
slguan 419a061075 [TD-10] 2020-03-14 17:57:06 +08:00
slguan d90df1752f failed to drop vnode in dnodeMgmt 2020-03-13 15:42:40 +08:00
slguan 6639ef6ed7 fix bug in dnode write module 2020-03-12 22:04:26 +08:00
slguan 66e5cd341d modify the code for synchronously creating tables 2020-03-12 18:13:57 +08:00
slguan 54405164cf [TD-10] change message name, and the create user commnad can be executed 2020-03-11 17:41:07 +08:00
slguan 7041b747a8 add code to dnode module 2020-03-11 15:08:57 +08:00
slguan 311b40b691 [TD-10] change some message types 2020-03-11 11:49:34 +08:00
slguan 3006a756c9 refactor dnode module code 2020-03-11 10:41:00 +08:00
slguan 82a72bf2be fix compile errors 2020-03-10 17:41:25 +08:00
slguan 31265ce2f8 refact mnode 2020-03-10 16:55:56 +08:00
slguan 0a91279667 refactor mgmtUser and mgmtAcct 2020-03-10 14:04:41 +08:00
slguan fcde340200 refactor mgmtShell and mgmt 2020-03-10 13:20:18 +08:00
slguan 055b9b1b69 add some code in dnode module 2020-03-09 21:17:46 +08:00
slguan a305bb422d Add code for module dnodeMgmt 2020-03-09 16:26:35 +08:00
slguan 39bdc75bf7 Merge branch '2.0' into refact/slguan
# Conflicts:
#	src/client/src/tscServer.c
2020-03-08 22:13:21 +08:00
slguan 88b413ccc7 fix compile error in dnode module 2020-03-08 21:52:53 +08:00
slguan bfbd270721 fix compile error in mnode while rpc interface changed 2020-03-08 21:30:09 +08:00
hjxilinx bb1a615c46 add query module, remove some functions from utility and tsclient module 2020-03-08 16:39:25 +08:00
slguan f8d35c2a4b fix compile error 2020-03-06 22:04:18 +08:00
slguan a00be5e3e8 refact code for cluster 2020-03-06 17:06:02 +08:00
slguan 0d4618ce1b fix compile errors in cluster module 2020-03-05 10:12:10 +08:00
slguan 3a056eddea for cluster module 2020-03-04 20:49:23 +08:00
slguan 22a6eeb528 fix compile error in 2.0 2020-03-04 10:09:46 +08:00
slguan cfd3e5149c compile for mgmt grant 2020-03-03 18:27:18 +08:00
slguan 8fc096e3fc sort out mgmt account 2020-03-03 16:39:32 +08:00
slguan 14ecbb0fe7 rename some funciton pointors 2020-03-02 22:58:11 +08:00
slguan 234113ef04 connection from shell to dnode 2020-02-29 15:15:09 +08:00
slguan bddda5430b submit message 2020-02-28 22:29:53 +08:00
slguan 55a9a5db0c message for drop vgroup 2020-02-28 18:14:39 +08:00
slguan 683ef75fda message for drop table 2020-02-28 14:33:33 +08:00
slguan a05776b0f7 create table msg sync process to dnode 2020-02-28 00:30:07 +08:00
slguan aa84e61e58 communication from dnode to mgmt 2020-02-27 17:04:04 +08:00
slguan 5cb76602cd communication from dnode to mgmt 2020-02-27 10:21:41 +08:00
slguan 86402cc934 conection from mgmt to dnode 2020-02-26 19:29:23 +08:00
slguan ce906917ff create table in mnode 2020-02-26 15:14:32 +08:00
slguan 78812e6d90 create super table 2020-02-25 14:22:21 +08:00
slguan a563fb8f74 create database message 2020-02-24 23:02:29 +08:00
slguan 156fa5d4c9 compile for rpc rename index 2020-02-24 21:31:03 +08:00
slguan 3f972b90a6 refact for user manage 2020-02-24 21:05:49 +08:00
slguan 81975c11b7 super table config 2020-02-24 15:53:22 +08:00
slguan 7cedf4afd6 rename meter to table 2020-02-24 14:48:14 +08:00
slguan 03da5549ce get meta message 2020-02-24 14:27:07 +08:00
slguan ddbf242fa6 process show message 2020-02-23 18:04:57 +08:00
slguan 5b969523cb rename SCM to S 2020-02-23 16:34:09 +08:00
slguan aee99f114f sort out connect message from client to mgmt 2020-02-23 16:18:28 +08:00
slguan 582e6ed6a5 rollback change name 2020-02-23 11:06:09 +08:00
slguan cee2e18bb2 change message name 2020-02-23 11:03:15 +08:00
slguan cdee51f60c message of account 2020-02-23 10:18:04 +08:00
slguan 07e6caa32c shell can connect to server 2020-02-22 18:58:43 +08:00
slguan d43c0ab26a client can send msg to server 2020-02-22 17:09:38 +08:00
slguan b4d1bc952b remove connObj 2020-02-22 13:41:54 +08:00
slguan a241006dd0 server in mgmtShell 2020-02-22 10:37:32 +08:00
slguan cbbe8c16dc fix compile errors 2020-02-21 21:24:54 +08:00
slguan db1e1e5460 delete extra java files 2020-02-21 20:47:36 +08:00
slguan 6ae7357a33 fix some compile errors 2020-02-21 10:13:44 +08:00
slguan b973c6e30c for table sdb 2020-02-20 23:56:33 +08:00
slguan 06db5c544c super table sdb 2020-02-20 22:53:08 +08:00
slguan 95f748ca74 mgmtTable.c 2020-02-20 22:18:08 +08:00
slguan b7050af1f0 reorgnize mgmtVgroup.c 2020-02-20 21:46:30 +08:00
slguan 79341c73d2 reorgnize mgmtDnode.c 2020-02-20 21:10:42 +08:00
slguan f626507456 reorganize the file mgmtAcct.c and mgmtUser.c 2020-02-20 15:51:42 +08:00
slguan dfafa1be82 reorganize the file mgmtSystem.c 2020-02-20 14:45:50 +08:00
slguan 23693d9c53 compile error 2020-02-20 11:35:26 +08:00
slguan 2905864579 fix compile errors 2020-02-19 23:48:17 +08:00
slguan 4cce8fbb27 dnode 2020-02-19 14:34:56 +08:00
slguan cdc3ce7248 rename modules to plugins 2020-02-19 11:40:05 +08:00
slguan 3aef011db2 dnodeMgmt.h 2020-02-18 23:58:53 +08:00
slguan 10f78bb5fb dnodeMgmt.c 2020-02-18 23:23:58 +08:00
slguan 151a11ba5e dnodeShell.c 2020-02-18 18:20:08 +08:00
slguan 24190a8faa dnodeShell 2020-02-17 23:57:16 +08:00
slguan cb1c3a174b rename tsdb.h 2020-02-14 23:18:14 +08:00
slguan 649ef3d307 #1177 2020-02-14 16:56:20 +08:00
slguan 5e054576a3 mgmtTable 2020-02-14 14:37:01 +08:00
slguan 81fef75fb8 #1177 2020-02-13 22:41:30 +08:00
slguan 1a2b98c526 #1177 2020-02-12 21:15:44 +08:00
slguan f9f0e72d1d vnodePeer.h 2020-02-12 15:32:29 +08:00
slguan 7046203557 split meter to table and stable 2020-02-12 12:46:01 +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
slguan 74039b30dc #1177 2020-02-11 18:26:28 +08:00
slguan c6dbaa8274 #1177 2020-02-11 15:51:56 +08:00
slguan 9427e9d8d4 sort out mnode 2020-02-11 15:48:08 +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
slguan d97941aacf rename from meter to table 2020-02-10 20:43:19 +08:00
slguan 53ef820cc7 rename from mgmt.h to mnode.h 2020-02-10 19:52:22 +08:00
slguan 8cb0846544 #1177 2020-02-09 22:34:57 +08:00
slguan 1e1b70540d #1177 2020-02-08 15:39:03 +08:00
slguan dd44e5f994 #1177 2020-02-07 15:24:54 +08:00
slguan d6ed76059b #1177 2020-02-07 08:07:08 +08:00
slguan 78d9ffd72c #1177 2020-02-06 21:28:17 +08:00
slguan 0fb0d0bdd3 Merge branch 'develop' into 2.0 2020-02-05 22:59:56 +08:00
slguan 0ca664d876 #1177 2020-02-05 21:36:58 +08:00
slguan abb7731a5e #1177 2020-02-05 17:01:48 +08:00
slguan ded5426498 #1177 2020-02-04 00:02:40 +08:00
slguan d128fc9b74 #1177 2020-02-03 22:21:21 +08:00
slguan 5c921ca8b5 Merge branch 'develop' into 2.0 2020-02-03 21:21:58 +08:00
slguan ea1723bd60 #1177 2020-02-03 21:21:31 +08:00
slguan 46408db8ff #1177 2020-02-03 12:22:28 +08:00