CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f74b2434 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f74b2434 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f74b2434 Branch: refs/heads/awsapi-ec2-version-update Commit: f74b24346086a71bb4613bca9be658c6cb45e760 Parents: cefd70e Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Fri Jun 28 09:46:23 2013 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Fri Jun 28 10:46:34 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/f74b2434/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/f74b2434/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");