Merge branch 'ui-new-project-switcher' into ui-mixed-zone-management
Conflicts:
ui/scripts/ui-custom/projectSelect.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5891f09d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5891f09d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5891f09d
Branch: refs/heads/master
Commit: 5891f09d8c1420e8d27db44e62c0dab89eeb0d55
Parents: 5d05e49 d529eba
Author: Brian Federle <[email protected]>
Authored: Tue Apr 16 11:47:19 2013 -0700
Committer: Brian Federle <[email protected]>
Committed: Tue Apr 16 11:47:19 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/projectSelect.js | 38 ++++++++++++++++++++++++++-
ui/scripts/ui-custom/projects.js | 6 +++-
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
