You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/09 10:26:33 UTC
[1/2] stratos git commit: Fixed issued found in
list-kubernetes-clusters and list-kubernetes-hosts CLI command
Repository: stratos
Updated Branches:
refs/heads/master d11ed6c6e -> 5465dd56d
Fixed issued found in list-kubernetes-clusters and list-kubernetes-hosts CLI command
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8a93771c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8a93771c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8a93771c
Branch: refs/heads/master
Commit: 8a93771c2262b00404f13899d9974e5bd65a58d2
Parents: d11ed6c
Author: Dinithi <di...@wso2.com>
Authored: Mon Mar 9 14:26:03 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Mon Mar 9 14:26:03 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/cli/RestCommandLineService.java | 2 +-
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8a93771c/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 9a3f171..33c27bc 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -1147,7 +1147,7 @@ public class RestCommandLineService {
if ((list != null) && (list.size() > 0)) {
RowMapper<KubernetesHostBean> partitionMapper = new RowMapper<KubernetesHostBean>() {
public String[] getData(KubernetesHostBean kubernetesHost) {
- String[] data = new String[3];
+ String[] data = new String[4];
data[0] = kubernetesHost.getHostId();
data[1] = kubernetesHost.getHostname();
data[2] = emptyStringIfNullOrEmpty(kubernetesHost.getPrivateIPAddress());
http://git-wip-us.apache.org/repos/asf/stratos/blob/8a93771c/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index fbc3ff6..89148fb 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -117,7 +117,7 @@
<value>portMappings</value>
<value>volumes</value>
<value>domains</value>
- <value>kubernetesHost</value>
+ <value>kubernetesHosts</value>
<value>cartridges</value>
<value>subGroups</value>
<value>groups</value>
@@ -136,6 +136,7 @@
<value>kubernetesServices</value>
<value>publicIPs</value>
<value>ports</value>
+ <value>metadataKeys</value>
</list>
</property>
</bean>
[2/2] stratos git commit: This closes #265 on GitHub
Posted by im...@apache.org.
This closes #265 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5465dd56
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5465dd56
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5465dd56
Branch: refs/heads/master
Commit: 5465dd56d949185610a1a6e1f81ea5eafd19af3b
Parents: 8a93771
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 9 14:56:27 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 9 14:56:27 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------