Merge remote-tracking branch 'remotes/origin/scale-UP'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae4befb0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae4befb0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae4befb0 Branch: refs/heads/cisco-vnmc-api-integration Commit: ae4befb0b9215b91049b5c9126710741b5feeabe Parents: 8d6bb95 534f554 Author: Pranav Saxena <[email protected]> Authored: Fri Apr 5 15:06:36 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri Apr 5 15:06:36 2013 +0530 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 6 ++++-- ui/scripts/instances.js | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae4befb0/ui/css/cloudstack3.css ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae4befb0/ui/scripts/instances.js ----------------------------------------------------------------------
