You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/25 00:56:36 UTC
[12/12] git commit: updated refs/heads/ui-restyle to e13c32f
Merge branch 'asf-master' into ui-restyle
Conflicts:
ui/scripts/ui/widgets/listView.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e13c32f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e13c32f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e13c32f3
Branch: refs/heads/ui-restyle
Commit: e13c32f34d46d9ac380a7d952e2a351c398b4b21
Parents: 500c798 3734af1
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:56:13 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:56:13 2013 -0700
----------------------------------------------------------------------
.../com/cloud/server/ManagementServerImpl.java | 4 +-
ui/css/cloudstack3.css | 241 ++++++++++---------
ui/images/logo-login-oss.png | Bin 4567 -> 22165 bytes
ui/images/logo.png | Bin 3886 -> 21781 bytes
ui/index.jsp | 6 +-
ui/scripts/instances.js | 34 ++-
ui/scripts/templates.js | 40 ++-
.../hypervisor/vmware/util/VmwareClient.java | 5 +-
8 files changed, 203 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e13c32f3/ui/index.jsp
----------------------------------------------------------------------