Commit Graph

141 Commits

Author SHA1 Message Date
plum-lihui 66eee02ce3 change version number 2021-02-10 09:21:13 +08:00
huili cf983f8c1c
Merge pull request #5177 from taosdata/feature/TD-2005
[TD-2005]<feature>: add Error Number for jdbc driver errors
2021-02-06 18:39:57 +08:00
zyyang 979c446ecb change 2021-02-06 17:57:04 +08:00
Hui Li 467fcba39f [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:29:16 +08:00
Hui Li 8e3df07217 [TD-2935]<fix>not set commit id when no git cmd 2021-02-04 16:27:13 +08:00
Hongze Cheng 584b147f1d Merge branch 'develop' into feature/TD-1925_new 2021-01-27 10:43:16 +08:00
zyyang dd3115358a change 2021-01-26 11:07:23 +08:00
Shengliang Guan be5e6182df Merge from develop 2021-01-25 08:23:32 +00:00
Shengliang Guan 80dfa0a47e TD-2837 2021-01-25 12:54:27 +08:00
Shengliang Guan 39bd90915a TD-1207 compile error in windows 2021-01-25 11:30:41 +08:00
freemine c96827dcb4 Merge remote-tracking branch 'upstream/develop' into mac 2021-01-23 09:38:28 +08:00
Hongze Cheng f30a58fd74 Merge branch 'feature/sim' into feature/TD-1925_new 2021-01-21 16:02:31 +08:00
huili d69ff9f695
Merge pull request #4972 from taosdata/hotfix/test
Hotfix/test
2021-01-21 14:04:06 +08:00
Hui Li b055dd6665 [TD-1077]<fix> add git commit id when make install 2021-01-21 09:59:30 +08:00
Hongze Cheng 57f6b2be3e Merge branch 'develop' into feature/TD-1925_new 2021-01-21 01:50:08 +00:00
Hui Li db4502c186 []cd .. 2021-01-20 16:52:38 +08:00
zyyang b33daefe82 [TD-2794]<fix>: fix authentication failed with changed password 2021-01-20 15:00:52 +08:00
freemine 0c96f7653e 1. bugfix: eok.c: array of pointers rather than POD buffer
2. initial port of taosd for MacOSX
2021-01-17 21:40:39 +08:00
Hongze Cheng ddf53cd785 Merge branch 'develop' into feature/TD-1925_new 2021-01-16 23:18:51 +08:00
huili 20d0279971
Merge pull request #4919 from taosdata/test/TD-2695
Test/td 2695
2021-01-16 15:08:05 +08:00
plum-lihui 6c3e1629e6 change version 2021-01-15 17:39:36 +08:00
zyyang ebf3b3a61e change 2021-01-12 11:31:51 +08:00
Hongze Cheng e82a6c84d4 Merge branch 'develop' into feature/TD-1925_new 2021-01-06 05:16:29 +00:00
plum-lihui 441b97a295 change version number 2021-01-01 23:04:25 +08:00
Hongze Cheng a7c6e73fb6 Merge branch 'develop' into feature/TD-1925 2020-12-28 11:27:33 +08:00
plum-lihui 19ac1515e8 change version 2020-12-26 11:28:18 +08:00
Hongze Cheng dd459c531a Merge branch 'develop' into feature/TD-1925 2020-12-21 17:13:45 +08:00
plum-lihui 5df39642d8 change version number 2020-12-18 13:49:10 +08:00
huili 1c1bdfd32b
Merge pull request #4562 from taosdata/release/s108
Release/s108
2020-12-15 13:02:49 +08:00
Shengliang Guan 547fa46ae7 fix compile errors 2020-12-13 23:29:08 +08:00
Shengliang Guan ce393e4d2d add release compile flags 2020-12-13 23:03:13 +08:00
Shengliang Guan 67d25a29ee TD-1853 2020-12-13 22:23:00 +08:00
plum-lihui 102c3989c4 release/s108 2020-12-11 22:32:39 +08:00
Shengliang Guan 9598664f41 Merge from develop 2020-12-09 10:50:18 +08:00
huili 6d9feb0bc4
Merge pull request #4481 from taosdata/hotfix/TD-2364
Hotfix/td 2364
2020-12-08 16:42:45 +08:00
zyyang 97b64d5654 [TD-2364]<fix>: fix mybatis-plus pagenation exceptions 2020-12-08 11:07:11 +08:00
Shengliang Guan 5aef8c57ac Re implement the TD-1925 code because it cannot merge 2020-12-07 12:57:35 +08:00
Shengliang Guan c17139097a Merge from develop 2020-12-06 11:57:05 +00:00
stephenkgu 9c194c6eb8 Merge branch 'release/s107' of https://github.com/taosdata/TDengine into release/s107 2020-12-04 17:09:23 +08:00
zyyang 1e4c61bb26 change jdbc version number 2020-12-04 14:13:40 +08:00
plum-lihui 030fc35958 change version number 2020-12-04 13:48:14 +08:00
Shengliang Guan 6507ac3c39 TD-1207 2020-12-01 14:54:46 +08:00
Hongze Cheng 540d42452d Merge branch 'develop' into feature/TD-1413 2020-11-26 16:09:51 +08:00
huili b2aadbb896
Merge pull request #4323 from taosdata/feature/TD-1859
Feature/td 1859
2020-11-25 17:54:42 +08:00
Hongze Cheng f68b434356 Merge branch 'develop' into feature/TD-1413 2020-11-24 05:07:34 +00:00
zyyang 5e91e8e307 change 2020-11-23 19:28:45 +08:00
plum-lihui 30e18f31b7 change version number 2020-11-20 20:08:41 +08:00
Hongze Cheng 35ead50063 Merge branch 'develop' into feature/TD-1413 2020-11-19 08:53:18 +00:00
huili b4e8f00a4c
Merge pull request #3981 from freemine/odbc
odbc connector, keep going
2020-11-19 14:49:22 +08:00
Hongze Cheng de1a75f64d Merge branch 'develop' into feature/TD-1413 2020-11-18 10:17:18 +08:00