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/f0941420 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0941420 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0941420 Branch: refs/heads/ui-cisco-asa1000v-support Commit: f0941420e9778a783e8f1019eadb82b648b8de87 Parents: 566a4d4 73d87f1 Author: Brian Federle <[email protected]> Authored: Thu Apr 18 13:59:52 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Thu Apr 18 13:59:52 2013 -0700 ---------------------------------------------------------------------- pom.xml | 16 +++++++++ ui/scripts/plugins.js | 77 ++++++++++++++++++++------------------------ 2 files changed, 51 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
