Commit f514488
committed
[PBCKP-254] fixing build errors after the merge
1. [commit 549d98a]
In the PBCKP-181 task, the 'get_log_message' function
that was used in the PBCKP-169 task was removed. Corrected it.
2. The order of arguments for 'fio_*' functions has been changed.
[commit 5a6bd01]
Fixed conflicts that came with the task [PBCKP-153].
[commit 4185570]1 parent 16c0508 commit f514488
2 files changed
+4
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1066 | 1066 | | |
1067 | 1067 | | |
1068 | 1068 | | |
1069 | | - | |
| 1069 | + | |
1070 | 1070 | | |
1071 | 1071 | | |
1072 | | - | |
| 1072 | + | |
1073 | 1073 | | |
1074 | 1074 | | |
1075 | 1075 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
506 | 506 | | |
507 | 507 | | |
508 | 508 | | |
509 | | - | |
| 509 | + | |
510 | 510 | | |
511 | 511 | | |
512 | 512 | | |
513 | 513 | | |
514 | | - | |
| 514 | + | |
515 | 515 | | |
516 | 516 | | |
517 | 517 | | |
| |||
0 commit comments