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/f7fab6f8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7fab6f8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7fab6f8 Branch: refs/heads/master Commit: f7fab6f8014dd1d0640c61ad4dc7d1a390415155 Parents: 846729a b1f6d89 Author: Brian Federle <[email protected]> Authored: Fri May 10 10:02:46 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri May 10 10:02:46 2013 -0700 ---------------------------------------------------------------------- ui/modules/infrastructure/infrastructure.js | 75 ++++ ui/modules/modules.js | 3 + ui/modules/vnmcAsa1000v/vnmcAsa1000v.js | 183 ++++++++ .../vnmcNetworkProvider/vnmcNetworkProvider.js | 322 +++++++++++++++ ui/scripts/system.js | 8 + 5 files changed, 591 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
