github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4653 from thockin/secret_fixups

Browse Source 
Secrets fixups
This commit is contained in:
Tim Hockin
2015-02-23 13:49:19 -08:00
parent 502f040129 3e7248f0f4
commit eed36455a7
21 changed files with 162 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/predicates_test.go
View File

@@ -277,7 +277,7 @@ func TestDiskConflicts(t *testing.T) {
Volumes: []api.Volume{
{
Source: api.VolumeSource{
GCEPersistentDisk: &api.GCEPersistentDisk{
GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{
PDName: "foo",
},
},
@@ -288,7 +288,7 @@ func TestDiskConflicts(t *testing.T) {
Volumes: []api.Volume{
{
Source: api.VolumeSource{
GCEPersistentDisk: &api.GCEPersistentDisk{
GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{
PDName: "bar",
},
},