You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/07/28 08:57:24 UTC
[56/71] [abbrv] git commit: updated refs/heads/4.2 to e6ce4da
CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]
Signed-off-by: Likitha Shetty <li...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/844484a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/844484a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/844484a8
Branch: refs/heads/4.2
Commit: 844484a858375248e405f2fec11ff75aa9b84915
Parents: b19b549
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jun 28 09:46:23 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Sun Jul 28 12:19:20 2013 +0530
----------------------------------------------------------------------
awsapi/conf/ec2-service.properties.in | 2 +-
awsapi/src/com/cloud/bridge/service/EC2RestServlet.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/844484a8/awsapi/conf/ec2-service.properties.in
----------------------------------------------------------------------
diff --git a/awsapi/conf/ec2-service.properties.in b/awsapi/conf/ec2-service.properties.in
index 6af0f63..82f5ad8 100644
--- a/awsapi/conf/ec2-service.properties.in
+++ b/awsapi/conf/ec2-service.properties.in
@@ -18,7 +18,7 @@
managementServer=127.0.0.1
cloudAPIPort=8080
cloudstackVersion=2.2.0
-WSDLVersion=2010-11-15
+WSDLVersion=2012-08-15
keystore=xes.keystore
keystorePass=apache
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/844484a8/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index de84aee..65fe34e 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -208,7 +208,7 @@ public class EC2RestServlet extends HttpServlet {
}
String keystore = EC2Prop.getProperty( "keystore" );
keystorePassword = EC2Prop.getProperty( "keystorePass" );
- wsdlVersion = EC2Prop.getProperty( "WSDLVersion", "2010-11-15" );
+ wsdlVersion = EC2Prop.getProperty( "WSDLVersion", "2012-08-15" );
version = EC2Prop.getProperty( "cloudbridgeVersion", "UNKNOWN VERSION" );
String installedPath = System.getenv("CATALINA_HOME");