Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dd949aeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dd949aeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dd949aeb Branch: refs/heads/vpc Commit: dd949aebafa4d9e167e772370d4cc609266711cd Parents: 4fadc3b 989ae46 Author: David Nalley <[email protected]> Authored: Tue Aug 7 19:05:34 2012 -0400 Committer: David Nalley <[email protected]> Committed: Tue Aug 7 19:05:34 2012 -0400 ---------------------------------------------------------------------- awsapi/.classpath | 18 - build/developer.xml | 2 +- server/src/com/cloud/api/ApiServer.java | 126 +- .../src/com/cloud/servlet/ConsoleProxyServlet.java | 794 ++-- .../src/com/cloud/sample/UserCloudAPIExecutor.java | 3 +- .../cloud/test/stress/StressTestDirectAttach.java | 2788 +++++++------- .../com/cloud/test/stress/TestClientWithAPI.java | 64 +- test/src/com/cloud/test/utils/UtilsForTest.java | 392 +- ui/index.jsp | 44 - ui/scripts/ui/widgets/listView.js | 45 +- .../cloud/utils/component/ComponentLocator.java | 196 +- .../cloud/utils/component/PluggableService.java | 3 +- utils/src/com/cloud/utils/component/Plugin.java | 64 + utils/src/com/cloud/utils/encoding/Base64.java | 1739 --------- 14 files changed, 2311 insertions(+), 3967 deletions(-) ----------------------------------------------------------------------
