Merge branch 'master' into 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/566a4d4b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/566a4d4b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/566a4d4b Branch: refs/heads/ui-vpc-redesign Commit: 566a4d4b1ad0287e4332639d0791b40ac2ec62be Parents: 9a876ca 6babaf9 Author: Brian Federle <brian.fede...@citrix.com> Authored: Thu Apr 18 12:53:11 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Thu Apr 18 12:53:11 2013 -0700 ---------------------------------------------------------------------- packaging/debian/init/cloud-management | 2 +- tools/build/build_asf.sh | 2 +- ui/index.jsp | 3 +- ui/modules/modules.js | 20 +++++++ ui/scripts/plugins.js | 78 +++++++++++++++++++-------- 5 files changed, 79 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
