Merge branch 'master' into ui-regions

This commit is contained in:
Brian Federle 2013-02-27 13:18:52 -08:00
commit 74c3f35d7d
1 changed files with 2 additions and 2 deletions

View File

@ -7317,7 +7317,7 @@
title: 'label.add.cluster',
fields: {
zoneid: {
label: 'Zone',
label: 'Zone Name',
docID: 'helpClusterZone',
validation: { required: true },
select: function(args) {
@ -7412,7 +7412,7 @@
}
},
podId: {
label: 'label.pod',
label: 'Pod Name',
docID: 'helpClusterPod',
dependsOn: 'zoneid',
select: function(args) {