Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a18385e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a18385e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a18385e Branch: refs/heads/3.0.x Commit: 4a18385e47bbabdad87c6be29605643f48e61e1d Parents: 0083074 219bbb4 Author: Vijayendra Bhamidipati <[email protected]> Authored: Wed May 23 18:30:08 2012 -0700 Committer: Vijayendra Bhamidipati <[email protected]> Committed: Wed May 23 18:30:08 2012 -0700 ---------------------------------------------------------------------- ui/index.jsp | 8 ++++---- ui/scripts/instances.js | 10 +++------- ui/scripts/sharedFunctions.js | 4 ++-- ui/scripts/ui-custom/zoneChart.js | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
