aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-10-04 12:11:47 +0200
committerDan Engelbrecht <[email protected]>2022-10-04 12:11:47 +0200
commit44b9f23baf52b57a1d70377512f6b66b5b3eb3f4 (patch)
tree5cd0fb45ee0009d854cc5efcbc2ef49b337cd121
parent0.1.6-pre11 (diff)
parent0.1.6 (diff)
downloadzen-44b9f23baf52b57a1d70377512f6b66b5b3eb3f4.tar.xz
zen-44b9f23baf52b57a1d70377512f6b66b5b3eb3f4.zip
Merge branch 'release/0.1.6'
# Conflicts: # CHANGELOG.md # VERSION.txt # zenserver/upstream/upstreamcache.cpp
-rw-r--r--CHANGELOG.md3
-rw-r--r--VERSION.txt3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a27053d..6c597d3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@
- Improvement: Reduce buffer creation and copying in ParsePackageMessage
- Improvement: Don't read attachments for oplogs we already have when parsing oplog message
+## v0.1.6
+- Bugfix: Bugfix: Use bucket/key to get inline value in upstream for chunks without a chunkid (UE-164966)
+
## v0.1.5
- Bugfix: Don't fail entire request if GetCacheValue from Horde fails for a single value
diff --git a/VERSION.txt b/VERSION.txt
index 478f5acb9..2ce5b860f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1,2 @@
-0.1.6-pre11 \ No newline at end of file
+0.1.5
+0.1.6 \ No newline at end of file