Merge remote branch 'remotes/origin/dev/jpdonnelly/EUCA-2281' into ma…

…int/3.2/testing
eucalyptus · Jan 17, 2013 · 286d8f7 · 286d8f7
2 parents b518b8e + 569f9c8
commit 286d8f7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java b/clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java
@@ -98,9 +98,10 @@ public class SystemConfiguration extends AbstractPersistent {
   @ConfigurableField( description = "Domain name to use for DNS." )
   @Column( name = "dns_domain" )
   private String  dnsDomain;
-  @ConfigurableField( description = "Nameserver address." )
+  @ConfigurableField( description = "Nameserver hostname." )
   @Column( name = "nameserver" )
   private String  nameserver;
+  @ConfigurableField( description = "Nameserver ip address." )
   @Column( name = "ns_address" )
   private String  nameserverAddress;