ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up merge conflicts in the CHANGELOG

Browse Source 
There were a number of unflagged merge conflicts in the CHANGELOG
that resulted in duplicated sections and notes being out of place.
Clean them up.

Change-Id: I88a590fad9d8812554665102e764bdaeccaea827
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/374714
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ben Walker 2017-08-17 11:45:43 -07:00 committed by Daniel Verkamp
parent bf6caa753d
commit ea957ff3a6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -2,17 +2,12 @@
## v17.10: (Upcoming Release) ## v17.10: (Upcoming Release)
### NVMe driver ### Block Device Abstraction Layer (bdev)
Disable HotplugEnable option by default, users can enable it with
`HotplugEnable Yes` in `[Nvme]` section of the configuration file.
An [fio](http://github.com/axboe/fio) plugin was added that can route An [fio](http://github.com/axboe/fio) plugin was added that can route
I/O to the bdev layer. See the [plugin documentation](https://github.com/spdk/spdk/blob/master/examples/bdev/fio_plugin/README.md) I/O to the bdev layer. See the [plugin documentation](https://github.com/spdk/spdk/blob/master/examples/bdev/fio_plugin/README.md)
for more information. for more information.
### Block Device Abstraction Layer (bdev)
spdk_bdev_unmap() was modified to take an offset and a length in bytes as spdk_bdev_unmap() was modified to take an offset and a length in bytes as
arguments instead of requiring the user to provide an array of SCSI arguments instead of requiring the user to provide an array of SCSI
unmap descriptors. This limits unmaps to a single contiguous range. unmap descriptors. This limits unmaps to a single contiguous range.
@ -31,6 +26,9 @@ The NVMe driver now recognizes the NVMe 1.3 Namespace Optimal I/O Boundary field
NVMe 1.3 devices may report an optimal I/O boundary, which the driver will take NVMe 1.3 devices may report an optimal I/O boundary, which the driver will take
into account when splitting I/O requests. into account when splitting I/O requests.
The HotplugEnable option in `[Nvme]` sections of the configuration file is now
"No" by default. It was previously "Yes".
### NVMe-oF Target (nvmf) ### NVMe-oF Target (nvmf)
The NVMe-oF target no longer requires any in capsule data buffers to run, and The NVMe-oF target no longer requires any in capsule data buffers to run, and