Merge pull request #1836 from derekwaynecarr/cherry_picks

Merged by openshift-bot
openshift · Apr 21, 2015 · 2775625 · 2775625
2 parents 96eda97 + 16515a7
commit 2775625
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/describe.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/describe.go