Merge pull request #1845 from derekwaynecarr/cherry_picks

Merged by openshift-bot
openshift · Apr 22, 2015 · effa12c · effa12c
2 parents 4f3e65a + c208fbd
commit effa12c
Showing 1 changed file with 34 additions and 16 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/ref.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/ref.go