ibsdeveloper · ibsdeveloper · Jan 20, 2016 · Jan 25, 2016 · May 9, 2016 · Feb 20, 2016
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <dependencies>
     <dependency>

diff --git a/api/pom.xml b/api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <dependencies>
     <dependency>

diff --git a/api/src/org/apache/cloudstack/api/ApiServerService.java b/api/src/org/apache/cloudstack/api/ApiServerService.java
@@ -40,4 +40,8 @@ public ResponseObject loginUser(HttpSession session, String username, String pas
     public String handleRequest(Map params, String responseType, StringBuilder auditTrailSb) throws ServerApiException;
 
     public Class<?> getCmdClass(String cmdName);
+
+    public String getJSONContentType();
+
+    public boolean isSecureSessionCookieEnabled();
 }
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -78,8 +81,22 @@ public Long getServiceOfferingId() {
         return serviceOfferingId;
     }
 
+    //instead of reading a map directly we are using collections.
+    //it is because details.values() cannot be cast to a map.
+    //it gives a exception
     public Map<String, String> getDetails() {
-        return details;
+        Map<String, String> customparameterMap = new HashMap<String, String>();
+        if (details != null && details.size() != 0) {
+            Collection parameterCollection = details.values();
+            Iterator iter = parameterCollection.iterator();
+            while (iter.hasNext()) {
+                HashMap<String, String> value = (HashMap<String, String>)iter.next();
+                for (String key : value.keySet()) {
+                    customparameterMap.put(key, value.get(key));
+                }
+            }
+        }
+        return customparameterMap;
     }
 
     /////////////////////////////////////////////////////
@@ -142,4 +159,4 @@ public void execute() {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to scale vm");
         }
     }
-}
+}
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -77,7 +80,18 @@ public Long getServiceOfferingId() {
     }
 
     public Map<String, String> getDetails() {
-        return details;
+        Map<String, String> customparameterMap = new HashMap<String, String>();
+        if (details != null && details.size() != 0) {
+            Collection parameterCollection = details.values();
+            Iterator iter = parameterCollection.iterator();
+            while (iter.hasNext()) {
+                HashMap<String, String> value = (HashMap<String, String>)iter.next();
+                for (String key : value.keySet()) {
+                    customparameterMap.put(key, value.get(key));
+                }
+            }
+        }
+        return customparameterMap;
     }
 
     /////////////////////////////////////////////////////

diff --git a/client/pom.xml b/client/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <dependencies>
     <dependency>

diff --git a/core/pom.xml b/core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <dependencies>
     <dependency>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+cloudstack (4.7.1) unstable; urgency=low
+
+  * Update the version to 4.7.1
+
+ -- the Apache CloudStack project <dev@cloudstack.apache.org>  Wed, 20 Jan 2016 23:18:53 +0100
+
 cloudstack (4.7.1-SNAPSHOT) unstable; urgency=low
 
   * Update the version to 4.7.1-SNAPSHOT

diff --git a/developer/pom.xml b/developer/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <dependencies>
     <dependency>

diff --git a/engine/api/pom.xml b/engine/api/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/network/pom.xml b/engine/network/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/service/pom.xml b/engine/service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <artifactId>cloud-engine-service</artifactId>
   <packaging>war</packaging>

diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/config/pom.xml b/framework/config/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/db/pom.xml b/framework/db/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/events/pom.xml b/framework/events/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>  
   <dependencies>

diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-maven-standard</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../../maven-standard/pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/pom.xml b/framework/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
   </parent>
   <build>
     <defaultGoal>install</defaultGoal>

diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cloud-framework-rest</artifactId>

diff --git a/framework/security/pom.xml b/framework/security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-maven-standard</artifactId>
-        <version>4.7.1-SNAPSHOT</version>
+        <version>4.7.1</version>
         <relativePath>../../../maven-standard/pom.xml</relativePath>
     </parent>
     <dependencies>

diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-maven-standard</artifactId>
-        <version>4.7.1-SNAPSHOT</version>
+        <version>4.7.1</version>
         <relativePath>../../../maven-standard/pom.xml</relativePath>
     </parent>
     <dependencies>

diff --git a/maven-standard/pom.xml b/maven-standard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1-SNAPSHOT</version>
+    <version>4.7.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service
@@ -27,10 +27,11 @@ Environment=JAVA_HOME=/usr/lib/jvm/jre
 Environment=JAVA_HEAP_INITIAL=256m
 Environment=JAVA_HEAP_MAX=2048m
 Environment=JAVA_CLASS=com.cloud.usage.UsageServer
+Environment=JAVA_PID=$$
 ExecStart=/bin/sh -ec '\
     export UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar /usr/share/cloudstack-usage/lib/*.jar | tr "\\n" ":"`; \
     export CLASSPATH="$UCP:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar"; \
-    ${JAVA_HOME}/bin/java -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
+    ${JAVA_HOME}/bin/java -Dpid=${JAVA_PID} -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
 Restart=always
 RestartSec=10s