cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [19/49] git commit: updated refs/heads/marvin_refactor to 0b5fe9a
Date Sun, 21 Apr 2013 17:03:30 GMT
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/marvin_refactor
Commit: 5891f09d8c1420e8d27db44e62c0dab89eeb0d55
Parents: 5d05e49 d529eba
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Apr 16 11:47:19 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
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(-)
----------------------------------------------------------------------



Mime
View raw message