Merge branch 'sdminonne-container_sidecar'

2015-09-02 10:11:25 -07:00
parent 74ef517097 f4dc0653aa
commit 2df5010834
25 changed files with 1925 additions and 43 deletions
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -236,6 +236,9 @@ func TestExampleObjectSchemas(t *testing.T) {
 		"../docs/user-guide/downward-api": {
 			"dapi-pod": &api.Pod{},
 		},
+		"../docs/user-guide/downward-api/volume/": {
+			"dapi-volume": &api.Pod{},
+		},
 		"../examples/elasticsearch": {
 			"mytunes-namespace": &api.Namespace{},
 			"music-rc":          &api.ReplicationController{},