You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/09/08 13:26:05 UTC

[1/2] git commit: updated refs/heads/master to 3079253

Repository: cloudstack
Updated Branches:
  refs/heads/master bbafaf05b -> 30792532e


config: doc: add default value 10 in description for vm.network.nic.max.secondary.ipaddresses

value hardcoded by commit 4925b9f6a126454215531998c461bf376ac6ab67


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b956bbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b956bbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b956bbc

Branch: refs/heads/master
Commit: 0b956bbc1f198f72ad5a60ade21e42c0e23ec15c
Parents: dd9ba48
Author: Rene Moser <ma...@renemoser.net>
Authored: Fri Sep 4 15:58:55 2015 +0200
Committer: Rene Moser <re...@swisstxt.ch>
Committed: Fri Sep 4 16:03:24 2015 +0200

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b956bbc/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index ca89881..182ec50 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -405,7 +405,7 @@ public enum Config {
     MaxNumberOfSecondaryIPsPerNIC(
             "Network", ManagementServer.class, Integer.class,
             "vm.network.nic.max.secondary.ipaddresses", "256",
-            "Specify the number of secondary ip addresses per nic per vm", null),
+            "Specify the number of secondary ip addresses per nic per vm. Default value 10 is used, if not specified.", null),
 
     EnableServiceMonitoring(
             "Network", ManagementServer.class, Boolean.class,


[2/2] git commit: updated refs/heads/master to 3079253

Posted by bh...@apache.org.
Merge pull request #777 from resmo/fix/config-string

config: doc: add default value 10 in description for vm.network.nic.max.secondary.ipaddresses

value hardcoded by commit 4925b9f6a126454215531998c461bf376ac6ab67

* pr/777:
  config: doc: add default value 10 in description for vm.network.nic.max.secondary.ipaddresses

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30792532
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30792532
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30792532

Branch: refs/heads/master
Commit: 30792532ed0f3f0622ac3ef6856d9b7d7a48d1d0
Parents: bbafaf0 0b956bb
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Sep 8 16:55:51 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Sep 8 16:55:51 2015 +0530

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------