Merge pull request #13973 from calavera/fix_zfs_options_doc_location

Move zfs options doc to the storage section.
Upstream-commit: 4ab8b8828666c8d0651e96d61b5c616d26c5e229
Component: engine
This commit is contained in:
moxiegirl
2015-06-24 15:52:13 -07:00
@@ -476,8 +476,6 @@ Currently supported options of `devicemapper`:
> Otherwise, set this flag for migrating existing Docker daemons to
> a daemon with a supported environment.
### Docker execdriver option
Currently supported options of `zfs`:
* `zfs.fsname`
@@ -490,6 +488,8 @@ Currently supported options of `zfs`:
$ docker -d -s zfs --storage-opt zfs.fsname=zroot/docker
### Docker execdriver option
The Docker daemon uses a specifically built `libcontainer` execution driver as
its interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.