Merge branch 'master' into affinity_groups
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90172c38 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90172c38 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90172c38 Branch: refs/heads/affinity_groups Commit: 90172c38f89ccc19df111ea70785e5d960bfbb1b Parents: f92e265 265cf42 Author: Prachi Damle <[email protected]> Authored: Tue Apr 9 15:05:39 2013 -0700 Committer: Prachi Damle <[email protected]> Committed: Tue Apr 9 15:05:39 2013 -0700 ---------------------------------------------------------------------- LICENSE | 64 - client/tomcatconf/componentContext.xml.in | 2 + client/tomcatconf/nonossComponentContext.xml.in | 2 + client/tomcatconf/server.xml.in | 231 -- debian/cloudstack-management.install | 2 - debian/cloudstack-management.postinst | 9 +- debian/rules | 12 +- docs/en-US/Book_Info_Release_Notes_4-0.xml | 7 +- docs/en-US/Release_Notes.xml | 2011 +----------------- docs/publican-cloudstack/en-US/Feedback.xml | 56 +- packaging/centos63/cloud-agent.rc | 3 +- packaging/centos63/cloud.spec | 63 +- packaging/centos63/package.sh | 218 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- setup/db/db/schema-40to410.sql | 2 - tools/cli/cloudmonkey/cloudmonkey.py | 45 +- tools/cli/cloudmonkey/config.py | 2 +- tools/cli/cloudmonkey/requester.py | 63 +- tools/waf/javadir.py | 38 - tools/waf/mkisofs.py | 84 - tools/waf/tar.py | 79 - tools/waf/tomcat.py | 57 - tools/waf/usermgmt.py | 140 -- tools/whisker/LICENSE | 64 - tools/whisker/descriptor-for-packaging.xml | 24 - tools/whisker/descriptor.xml | 24 - ui/css/cloudstack3.css | 6 +- ui/scripts/instances.js | 41 + 29 files changed, 411 insertions(+), 2942 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90172c38/client/tomcatconf/componentContext.xml.in ----------------------------------------------------------------------
