Skip to content

Commit 6f60b06

Browse files
committed
Merge remote-tracking branch 'origin/v11' into release/v11.2.1
# Conflicts: # agent/updater/service/install.go # backend/src/main/resources/config/liquibase/master.xml # frontend/src/app/app-management/app-logs/app-logs.component.ts # frontend/src/app/shared/services/code-editor/sql-validation.service.ts
2 parents c14a3ca + 1e624aa commit 6f60b06

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

agent/updater/service/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func InstallService() {
2727
fmt.Println("\nError starting new service: ", err)
2828
os.Exit(1)
2929
}
30-
utils.UpdaterLogger.Info("updater service installed succefull")
30+
utils.UpdaterLogger.Info("updater service installed successfully")
3131
}
3232

3333
func UninstallService() {

frontend/src/app/app-management/app-logs/app-logs.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class AppLogsComponent implements OnInit {
5757
private onSuccess(data, headers) {
5858
this.totalItems = headers.get('X-Total-Count');
5959
this.logs = data || [];
60-
console.log('Logs loaded:', this.logs);
60+
6161
this.loading = false;
6262
}
6363

frontend/src/app/shared/services/code-editor/sql-validation.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ export class SqlValidationService {
6767
private balancedQuotes(query: string): boolean {
6868
let sq = 0;
6969
let dq = 0;
70-
let escaped = false; for (const c of query) {
70+
let escaped = false;
71+
for (const c of query) {
7172
if (escaped) { escaped = false; continue; }
7273
if (c === '\\') { escaped = true; continue; }
7374
if (c === '\'') {

0 commit comments

Comments
 (0)