Merge pull request #3301 from liggitt/debug_tokens

Merged by openshift-bot
openshift · Jun 18, 2015 · 55096e1 · 55096e1
2 parents b18a7a5 + aa4ccd6
commit 55096e1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/serviceaccount/jwt.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/serviceaccount/jwt.go
diff --git a/...ace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/serviceaccount/tokens_controller.go b/...ace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/serviceaccount/tokens_controller.go