Merge branch 'ui-cisco-asa1000v-support'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35164fde Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35164fde Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35164fde Branch: refs/heads/vmware-storage-motion Commit: 35164fde65fcff61cabeb5edd2269348f25bba06 Parents: 7b46599 8811bcc Author: Brian Federle <[email protected]> Authored: Mon May 13 11:10:34 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Mon May 13 11:10:34 2013 -0700 ---------------------------------------------------------------------- ui/modules/infrastructure/infrastructure.js | 75 ++++ ui/modules/modules.js | 3 + ui/modules/vnmcAsa1000v/vnmcAsa1000v.js | 183 ++++++++ .../vnmcNetworkProvider/vnmcNetworkProvider.js | 333 +++++++++++++++ ui/scripts/system.js | 8 + 5 files changed, 602 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
