From 727a80b328393484df610f6798c5b3d43c24414f Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Wed, 6 Jun 2018 12:50:25 -0700
Subject: [PATCH] SPDK 18.04.1

Change-Id: I5526837b75bb21f9c5d7fdd4363763f6ebfa0a2b
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/414070
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 CHANGELOG.md           | 10 +++++++++-
 include/spdk/version.h |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b1e97320..58735c208 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Changelog
 
-## v18.04.1: (Maintenance Release)
+## v18.04.1: Maintenance Release
 
+SPDK v18.04.1 is a bug fix and maintenance release.
+
+A bug in the blobstore recovery code for thin provisioned blobs has been fixed
+(GitHub issue #291).
+
+The `env_dpdk` environment layer has been updated to work with DPDK 18.05.
+
+The NVMe and bdev `fio_plugin` examples have been updated to work with FIO 3.7.
 
 ## v18.04: Logical Volume Snapshot/Clone, iSCSI Initiator, Bdev QoS, VPP Userspace TCP/IP
 
diff --git a/include/spdk/version.h b/include/spdk/version.h
index 422bdb4dc..715760d42 100644
--- a/include/spdk/version.h
+++ b/include/spdk/version.h
@@ -59,7 +59,7 @@
 /**
  * Version string suffix.
  */
-#define SPDK_VERSION_SUFFIX	"-pre"
+#define SPDK_VERSION_SUFFIX	""
 
 /**
  * Single numeric value representing a version number for compile-time comparisons.