Merge pull request #52889 from jianglingxia/jlx-changelogv1.6

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. the feature of Flex volume API and Improved lifecycle hasnot merge v1.6 **What this PR does / why we need it**: reopen #51580 because of rebase conflict,and remove changelog1.6 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #32543 **Special notes for your reviewer**: cc @xiangpengzhao @zhangxiaoyu-zidif **Release note**: ```release-note NONE ```

Merge pull request #52889 from jianglingxia/jlx-changelogv1.6
9de85c2e · Kubernetes Submit Queue · GitHub · 6d933e35 · 54a0678b · 9de85c2e
Commit 9de85c2e authored Oct 04, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

CHANGELOG-1.6.md CHANGELOG-1.6.md +0 -1

No files found.
--- a/CHANGELOG-1.6.md
+++ b/CHANGELOG-1.6.md
@@ -1296,7 +1296,6 @@ Features for this release were tracked via the use of the [kubernetes/features](
 * **[stable]** Add support to use NFSv3, NFSv4, and GlusterFS on GCE/GKE GCI image based clusters.
 * **[beta]** Added support for mount options in persistent volumes.
 * **[alpha]** All in one volume proposal - a new volume driver capable of projecting secrets, configmaps, and downward API items into the same directory.
-* **[alpha]** Flex volume API and Improved lifecycle (flexvolume).
 ## Deprecations
 * Remove extensions/v1beta1 Jobs resource, and job/v1beta1 generator. ([#38614](https://github.com/kubernetes/kubernetes/pull/38614), [@soltysh](https://github.com/soltysh))