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/6a7c41c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a7c41c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a7c41c7 Branch: refs/heads/4.1 Commit: 6a7c41c709e423eabf74b81c8e2b04471308bd73 Parents: 7cf6aee 8a18b7f Author: Chip Childers <[email protected]> Authored: Fri Mar 22 15:13:33 2013 +0000 Committer: Chip Childers <[email protected]> Committed: Fri Mar 22 15:13:33 2013 +0000 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 1841 +++++----- .../classes/resources/messages_ca.properties | 1777 ++-------- .../classes/resources/messages_de_DE.properties | 1561 ++------ .../classes/resources/messages_it_IT.properties | 1895 ++-------- .../classes/resources/messages_ko_KR.properties | 2902 +++++++-------- .../classes/resources/messages_nb_NO.properties | 1823 ++-------- .../classes/resources/messages_ru_RU.properties | 2807 +++++++-------- docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 2 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +- docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Installation_Guide.xml | 2 +- docs/en-US/about-regions.xml | 49 + docs/en-US/about-zones.xml | 2 +- docs/en-US/changed-apicommands-4.1.xml | 14 +- docs/en-US/cloud-infrastructure-concepts.xml | 3 +- docs/en-US/provisioning-steps-overview.xml | 13 +- docs/en-US/provisioning-steps.xml | 3 +- docs/en-US/region-add.xml | 128 + ui/index.jsp | 5 + 20 files changed, 5165 insertions(+), 9668 deletions(-) ----------------------------------------------------------------------
