incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [27/50] [abbrv] git commit: Merge branch 'master' into api_limit
Date Fri, 18 Jan 2013 22:23:43 GMT
Merge branch 'master' into api_limit

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c1a540c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c1a540c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c1a540c6

Branch: refs/heads/add_remove_nics
Commit: c1a540c6bbe6dc1186ee3e28986170f7195d26b7
Parents: 06fa338 3dabd5f
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Jan 16 22:48:22 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed Jan 16 22:48:22 2013 -0800

----------------------------------------------------------------------
 .../agent/api/storage/ResizeVolumeAnswer.java      |   40 +++
 .../agent/api/storage/ResizeVolumeCommand.java     |   86 +++++
 api/src/com/cloud/event/EventTypes.java            |    1 +
 api/src/com/cloud/exception/CloudException.java    |    1 -
 api/src/com/cloud/storage/StorageService.java      |   10 +
 api/src/com/cloud/storage/Volume.java              |    9 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    1 -
 .../api/command/user/volume/ResizeVolumeCmd.java   |  154 +++++++++
 .../agent/api/test/ResizeVolumeCommandTest.java    |  199 ++++++++++++
 client/tomcatconf/commands.properties.in           |    3 +-
 .../kvm/resource/LibvirtComputingResource.java     |   77 +++++
 .../xen/resource/CitrixResourceBase.java           |   22 ++
 scripts/storage/qcow2/resizevolume.sh              |  253 +++++++++++++++
 server/src/com/cloud/api/ApiServer.java            |    3 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    4 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |  180 ++++++++++
 test/integration/smoke/test_volumes.py             |  125 +++++++-
 tools/marvin/marvin/integration/lib/base.py        |    6 +
 ui/scripts/instanceWizard.js                       |    5 +-
 ui/scripts/system.js                               |    1 +
 21 files changed, 1168 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c1a540c6/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/commands.properties.in
index db722ad,182cbd8..3740fb0
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@@ -508,8 -509,3 +509,8 @@@ configureSimulator=
  #### api discovery commands
  
  listApis=15
 +
 +#### API Rate Limit service command
 +
 +getApiLimit=15
- resetApiLimit=1
++resetApiLimit=1

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c1a540c6/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/api/ApiServer.java
index 6b1de42,fc197b9..ed4173d
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@@ -386,6 -382,6 +386,7 @@@ public class ApiServer implements HttpR
              if (UserContext.current().getCaller().getType() != Account.ACCOUNT_TYPE_ADMIN){
                  // hide internal details to non-admin user for security reason
                  errorMsg = BaseCmd.USER_ERROR_MESSAGE;
++
              }
              throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, errorMsg,
ex);
          }


Mime
View raw message