Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfe2bfef Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfe2bfef Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfe2bfef Branch: refs/heads/master Commit: dfe2bfefb1dac271bf9ae047132d486afe2f65b8 Parents: 597d3d7 0646588 Author: amoghvk <amogh.vase...@citrix.com> Authored: Thu Oct 2 11:18:54 2014 -0700 Committer: amoghvk <amogh.vase...@citrix.com> Committed: Thu Oct 2 11:18:54 2014 -0700 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 93 ++++++++++++++++++++ ui/dictionary.jsp | 1 - ui/dictionary2.jsp | 54 +++--------- ui/scripts/configuration.js | 2 +- ui/scripts/storage.js | 2 +- ui/scripts/templates.js | 2 +- ui/scripts/ui-custom/physicalResources.js | 6 +- 7 files changed, 110 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
