Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge/main to 3.0 #762

Merged
merged 13 commits into from
Jun 26, 2024
Merged

Merge/main to 3.0 #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5bd5398
fix: csv file read need copy end char
DuanKuanJun Jun 12, 2024
51e5206
Merge pull request #755 from taosdata/fix/TS-5002
DuanKuanJun Jun 13, 2024
da62305
Update benchCommandOpt.c
DuanKuanJun Jun 13, 2024
5cbf094
Merge pull request #756 from taosdata/DuanKuanJun-patch-1
DuanKuanJun Jun 13, 2024
e8a6c45
merge: v3.3.2.0 3.0 to main
DuanKuanJun Jun 26, 2024
57c3b0c
fix: window build error
DuanKuanJun Jun 26, 2024
d9178d2
fix: window build no found window
DuanKuanJun Jun 26, 2024
e6a6e46
fix: window plat build error
DuanKuanJun Jun 26, 2024
315d4c7
fix: window plat build error1
DuanKuanJun Jun 26, 2024
690b6db
fix: window plat build error1
DuanKuanJun Jun 26, 2024
927801d
Merge pull request #761 from taosdata/merge/3.0_to_main
DuanKuanJun Jun 26, 2024
24c9c23
fix: remove buffer zero
DuanKuanJun Jun 26, 2024
e5049d8
Merge pull request #763 from taosdata/merge/3.0_to_main
DuanKuanJun Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/3.0-windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ on:
- cron: "10 16 * * *"
push:
branches:
- develop
- 3.0
- main
pull_request:
branches:
- develop
- 3.0
- main

Expand Down
1 change: 0 additions & 1 deletion src/taosdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,6 @@ static void printVersion(FILE *file) {

fprintf(file,"taosdump version: %s\ngit: %s\n", taostools_ver, taosdump_commit);
printf("build: %s\n", getBuildInfo());

if (strlen(taosdump_status) > 0) {
fprintf(file, "status:%s\n", taosdump_status);
}
Expand Down
Loading