Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29da4169 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29da4169 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29da4169 Branch: refs/heads/4.1 Commit: 29da416957dee8dfc92086d4649e1a5c255d4b32 Parents: 4af768d 42a2d42 Author: Chip Childers <[email protected]> Authored: Fri Apr 5 16:39:12 2013 +0100 Committer: Chip Childers <[email protected]> Committed: Fri Apr 5 16:39:12 2013 +0100 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 155 +- client/tomcatconf/componentContext.xml.in | 176 +- client/tomcatconf/db-enc.properties.in | 68 - client/tomcatconf/nonossComponentContext.xml.in | 184 +- client/tomcatconf/server.xml.in | 231 -- debian/cloudstack-management.install | 2 - debian/cloudstack-management.postinst | 11 +- debian/control | 4 +- debian/rules | 7 +- docs/en-US/Book_Info_Release_Notes_4-0.xml | 7 +- docs/en-US/Release_Notes.xml | 2005 +-------------- docs/publican-cloudstack/en-US/Feedback.xml | 56 +- packaging/centos63/cloud.spec | 9 +- packaging/debian/init/cloud-management | 3 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- .../src/com/cloud/utils/component/AdapterList.java | 34 + 17 files changed, 431 insertions(+), 2525 deletions(-) ----------------------------------------------------------------------
