浏览代码

Merge pull request #911 from ggtools/release_notes

Add missing cpu_shares option for rel. 1.1.0-rc1
Daniel Nephin 11 年之前
父节点
当前提交
4251f2b732
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      CHANGES.md

+ 1 - 1
CHANGES.md

@@ -37,7 +37,7 @@ Besides that, there’s a lot of new stuff in this release:
 
 - docker-compose.yml now has an `env_file` key, analogous to `docker run --env-file`, letting you specify multiple environment variables in a separate file. This is great if you have a lot of them, or if you want to keep sensitive information out of version control.
 
-- docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop` and `--restart` options.
+- docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop`, `cpu_shares` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop`, `--cpu-shares` and `--restart` options.
 
 - Compose now ships with Bash tab completion - see the installation and usage docs at https://github.com/docker/fig/blob/1.1.0-rc1/docs/completion.md