From 2b82ff20b1e72c28fa152a6651b35d827b6dbb03 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 14 Jun 2016 09:01:53 -0700 Subject: Revert "Redo v1.4.0-alpha.0" This reverts commit c7f1485e1b3491e98f102c30e7e342cb53dda818, reversing changes made to 939ad4115a2a96f1e18758ec45b7d312bec65aa7. --- initial-resources.md | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'initial-resources.md') diff --git a/initial-resources.md b/initial-resources.md index deabe1ac..b7cc48d3 100644 --- a/initial-resources.md +++ b/initial-resources.md @@ -1,5 +1,34 @@ + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + + + +The latest release of this document can be found +[here](http://releases.k8s.io/release-1.2/docs/proposals/initial-resources.md). + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). + +-- + + @@ -75,13 +104,6 @@ and should be introduced shortly after the first version is done: * add estimation as annotations for those containers that already has resources set * support for other data sources like [Hawkular](http://www.hawkular.org/) - - - - - - - [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/initial-resources.md?pixel)]() -- cgit v1.2.3