aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-08-09 07:56:11 +0200
committerGitHub <[email protected]>2023-08-09 07:56:11 +0200
commit5c747306bed2e03c961ed8edd81fb733c5750ae7 (patch)
tree2bca31a986ec10039a818a241dfb0f4be50d9d2e
parentadd more logging on jupiter fail (#345) (diff)
downloadzen-5c747306bed2e03c961ed8edd81fb733c5750ae7.tar.xz
zen-5c747306bed2e03c961ed8edd81fb733c5750ae7.zip
Bugfix: `oplog-import` with `--file` source now sends the oplog folder correctly to zenserver (#346)
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zen/cmds/projectstore.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce86efc7..4445bf9cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
##
+- Bugfix: `oplog-import` with `--file` source now sends the oplog folder correctly to zenserver
- Bugfix: If `oplog-export` fails while creating blocks, wait for background jobs to finish before aborting to avoid crash
- Bugfix: If `GetChunkInfo` in project store finds a chunk in the wrong format, return a readable error instead of ASSERT
- Bugfix: If checking for state_marker throws exception, exit gracefully rather than throw exception
diff --git a/src/zen/cmds/projectstore.cpp b/src/zen/cmds/projectstore.cpp
index e68563938..39976e333 100644
--- a/src/zen/cmds/projectstore.cpp
+++ b/src/zen/cmds/projectstore.cpp
@@ -799,7 +799,7 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg
{
Writer.BeginObject("file"sv);
{
- Writer.AddString("file"sv, m_FileDirectoryPath);
+ Writer.AddString("path"sv, m_FileDirectoryPath);
Writer.AddString("name"sv, m_FileName);
}
Writer.EndObject(); // "file"