Merge pull request #1959 from smarterclayton/fix_templates

Merged by openshift-bot
openshift · Apr 29, 2015 · 59012cd · 59012cd
2 parents 054bcbc + 705f0b6
commit 59012cd
Show file tree

Hide file tree

Showing 19 changed files with 382 additions and 91 deletions.
diff --git a/..._workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/fixture.go b/..._workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/fixture.go
diff --git a/...rkspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/testclient.go b/...rkspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/testclient.go
diff --git a/...ce/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/testclient_test.go b/...ce/src/github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient/testclient_test.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/conversion/error.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/conversion/error.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/conversion/scheme.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/conversion/scheme.go
diff --git a/.../_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource/visitor.go b/.../_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource/visitor.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/codec.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/codec.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/helper.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/helper.go
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/interfaces.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/runtime/interfaces.go