You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/05/31 00:24:53 UTC
[1/2] git commit: updated refs/heads/master to da53ef1
Updated Branches:
refs/heads/master 800cd391d -> da53ef1ae
ApiServer: fixed non primitive Long "snapshotLimit" comparsion
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da53ef1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da53ef1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da53ef1a
Branch: refs/heads/master
Commit: da53ef1aed11ae352eaf76b94cd3acc59089fc93
Parents: 62ad6c4
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu May 30 15:04:19 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu May 30 15:21:31 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da53ef1a/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 08468c4..9bad32c 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -208,7 +208,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
String strSnapshotLimit = configs.get(Config.ConcurrentSnapshotsThresholdPerHost.key());
if (strSnapshotLimit != null) {
Long snapshotLimit = NumbersUtil.parseLong(strSnapshotLimit, 1L);
- if (snapshotLimit <= 0) {
+ if (snapshotLimit.longValue() <= 0) {
s_logger.debug("Global config parameter " + Config.ConcurrentSnapshotsThresholdPerHost.toString()
+ " is less or equal 0; defaulting to unlimited");
} else {
[2/2] git commit: updated refs/heads/master to da53ef1
Posted by al...@apache.org.
ApiServer: replaced hardcoded value of the integration.api.port paramter with the reference to the actual paramter name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62ad6c45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62ad6c45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62ad6c45
Branch: refs/heads/master
Commit: 62ad6c4519a846625f5a7223fb4740d0651efb5c
Parents: 800cd39
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu May 30 15:00:29 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu May 30 15:21:31 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62ad6c45/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index b3098d1..08468c4 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -195,7 +195,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
public void init() {
Integer apiPort = null; // api port, null by default
SearchCriteria<ConfigurationVO> sc = _configDao.createSearchCriteria();
- sc.addAnd("name", SearchCriteria.Op.EQ, "integration.api.port");
+ sc.addAnd("name", SearchCriteria.Op.EQ, Config.IntegrationAPIPort.key());
List<ConfigurationVO> values = _configDao.search(sc, null);
if ((values != null) && (values.size() > 0)) {
ConfigurationVO apiPortConfig = values.get(0);