You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/10/04 00:37:08 UTC
[1/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Updated Branches:
refs/heads/master 3e1957933 -> 8faa030ed
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/8faa030e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8faa030e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8faa030e
Branch: refs/heads/master
Commit: 8faa030ed30988c00773adfc61ed48f440a669b2
Parents: a3a606f 3e19579
Author: David Nalley <da...@gnsa.us>
Authored: Wed Oct 3 18:36:52 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Oct 3 18:36:52 2012 -0400
----------------------------------------------------------------------
INSTALL.md | 143 ++
INSTALL.txt | 70 -
LICENSE | 2 +
README.md | 2 +-
agent/pom.xml | 5 +-
api/pom.xml | 5 +-
awsapi/conf/cloud-bridge.properties | 50 +-
awsapi/pom.xml | 57 +-
awsapi/resource/AmazonEC2/crypto.properties | 48 +-
awsapi/resource/Axis2/axis2.xml | 1122 +++++++-------
awsapi/scripts/run.bat | 36 +-
.../dao/CloudStackConfigurationDaoImpl.java | 7 +-
.../com/cloud/bridge/service/EC2MainServlet.java | 2 +-
awsapi/test/html/certSubmit.html | 74 +-
awsapi/test/html/testRestURL.txt | 88 +-
awsapi/web/web.xml | 290 ++--
client/pom.xml | 97 ++-
console-proxy/certs/realhostip.csr | 30 +-
console-proxy/pom.xml | 48 +-
console-proxy/ui/viewer-bad-sid.ftl | 58 +-
console-proxy/ui/viewer-connect-failed.ftl | 58 +-
console-proxy/ui/viewer.ftl | 118 +-
core/pom.xml | 19 +-
.../vmware/mo/TestVmwareContextFactory.java | 43 -
.../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 40 -
.../hypervisor/vmware/util/TestVmwareUtil.java | 107 --
core/test/com/cloud/vmware/TestVMWare.java | 1140 ---------------
deps/XenServerJava/pom.xml | 5 +-
deps/pom.xml | 7 +-
developer/pom.xml | 72 +-
docs/en-US/API_Developers_Guide.ent | 22 +-
docs/en-US/Book_Info_Admin.xml | 46 +
docs/en-US/add-members-to-projects.xml | 2 +
docs/en-US/api-overview.xml | 34 +
docs/en-US/cloudstack.xml | 79 +-
docs/en-US/cloudstack_plugin_niciranvp.ent | 22 +
docs/en-US/cloudstack_plugin_niciranvp.xml | 54 +
docs/en-US/compute-disk-service-offerings.xml | 40 +-
docs/en-US/configuring-projects.xml | 28 +-
docs/en-US/creating-compute-offerings.xml | 74 +-
docs/en-US/plugin-niciranvp-about.xml | 28 +
docs/en-US/plugin-niciranvp-devicemanagement.xml | 47 +
docs/en-US/plugin-niciranvp-features.xml | 29 +
docs/en-US/plugin-niciranvp-guide.xml | 31 +
docs/en-US/plugin-niciranvp-introduction.xml | 26 +
docs/en-US/plugin-niciranvp-preparations.xml | 36 +
docs/en-US/plugin-niciranvp-provider.xml | 42 +
docs/en-US/plugin-niciranvp-revisions.xml | 45 +
docs/en-US/plugin-niciranvp-tables.xml | 51 +
docs/en-US/plugin-niciranvp-troubleshooting.xml | 28 +
docs/en-US/plugin-niciranvp-usage.xml | 29 +
docs/en-US/plugin-niciranvp-uuidreferences.xml | 30 +
docs/en-US/projects-overview.xml | 31 +
docs/en-US/projects.xml | 48 +-
docs/en-US/provisioning-steps.xml | 1 -
docs/en-US/set-global-project-resource-limits.xml | 28 +
docs/en-US/set-per-project-resource-limits.xml | 28 +
docs/en-US/set-resource-limits-for-projects.xml | 4 +-
docs/en-US/suspend-project.xml | 14 +-
docs/en-US/system-service-offerings.xml | 2 +-
docs/en-US/ui.xml | 35 +-
docs/en-US/user-services-overview.xml | 119 +--
docs/publican-adminguide.cfg | 1 +
docs/publican-plugin-niciranvp.cfg | 28 +
patches/pom.xml | 5 +-
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 2 +-
.../debian/config/opt/cloud/bin/vpc_guestnw.sh | 30 +-
.../root/redundant_router/arping_gateways.sh.templ | 17 +
.../root/redundant_router/keepalived.conf.templ | 17 +
.../user-concentrated-pod/pom.xml | 5 +-
.../deployment-planners/user-dispersing/pom.xml | 5 +-
plugins/file-systems/netapp/pom.xml | 5 +-
plugins/host-allocators/random/pom.xml | 5 +-
plugins/hypervisors/kvm/agent-descriptor.xml | 68 +
plugins/hypervisors/kvm/pom.xml | 57 +-
plugins/hypervisors/ovm/pom.xml | 12 +-
plugins/hypervisors/vmware/pom.xml | 23 +-
.../hypervisor/vmware/resource/VmwareResource.java | 3 -
plugins/hypervisors/xen/pom.xml | 16 +-
.../network-elements/elastic-loadbalancer/pom.xml | 5 +-
plugins/network-elements/f5/pom.xml | 5 +-
plugins/network-elements/juniper-srx/pom.xml | 5 +-
plugins/network-elements/netscaler/pom.xml | 5 +-
plugins/network-elements/nicira-nvp/pom.xml | 5 +-
plugins/network-elements/ovs/pom.xml | 5 +-
plugins/pom.xml | 6 +-
plugins/storage-allocators/random/pom.xml | 5 +-
plugins/user-authenticators/ldap/pom.xml | 5 +-
plugins/user-authenticators/md5/pom.xml | 5 +-
plugins/user-authenticators/plain-text/pom.xml | 5 +-
pom.xml | 28 +-
server/pom.xml | 31 +-
.../com/cloud/migration/Db21to22MigrationUtil.java | 3 -
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 83 ++
test/pom.xml | 5 +-
tools/build/installer/rpminstall_full.sh | 7 +-
.../puppet-devcloud/files/builddevcloud.sh | 6 +
.../puppet-devcloud/files/installmaven.sh | 22 +
.../devcloudbox/puppet-devcloud/manifests/init.pp | 17 +
tools/whisker/descriptor.xml | 7 +
ui/scripts/instances.js | 107 +-
ui/scripts/network.js | 110 +-
ui/scripts/sharedFunctions.js | 43 +
ui/scripts/storage.js | 72 +-
ui/scripts/ui/widgets/listView.js | 14 +-
ui/scripts/ui/widgets/tagger.js | 14 +-
ui/scripts/zoneWizard.js | 8 +-
usage/pom.xml | 6 +-
utils/pom.xml | 29 +-
vmware-base/pom.xml | 5 +-
.../vmware/mo/TestVmwareContextFactory.java | 43 +
.../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 40 +
.../hypervisor/vmware/util/TestVmwareUtil.java | 107 ++
vmware-base/test/com/cloud/vmware/TestVMWare.java | 1140 +++++++++++++++
115 files changed, 4337 insertions(+), 2944 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8faa030e/docs/en-US/API_Developers_Guide.ent
----------------------------------------------------------------------
diff --cc docs/en-US/API_Developers_Guide.ent
index abb1885,0000000..c52e105
mode 100644,000000..100644
--- a/docs/en-US/API_Developers_Guide.ent
+++ b/docs/en-US/API_Developers_Guide.ent
@@@ -1,22 -1,0 +1,4 @@@
- <!-- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
- <!ENTITY PRODUCT "CloudStack">
++<!ENTITY PRODUCT "CloudPlatform">
+<!ENTITY BOOKID "Technical Documentation">
+<!ENTITY YEAR "2012">
- <!ENTITY HOLDER "Apache Software Foundation">
++<!ENTITY HOLDER "Citrix">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8faa030e/docs/publican-adminguide.cfg
----------------------------------------------------------------------