Merge branch 'ui-add-remove-nics' of https://git-wip-us.apache.org/repos/asf/cloudstack into ui-add-remove-nics
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b758d17 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b758d17 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b758d17 Branch: refs/heads/internallb Commit: 3b758d176e4e34b447914a6c79a2b6bf3ea5f441 Parents: c45fd05 ae79d78 Author: Brian Federle <[email protected]> Authored: Fri Apr 26 12:29:54 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri Apr 26 12:29:54 2013 -0700 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 2 + ui/dictionary.jsp | 2 + ui/scripts/instances.js | 21 +++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
