You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/01/28 14:48:49 UTC
[12/12] git commit: Merge branch 'master' into marvin-refactor-phase1
Updated Branches:
refs/heads/marvin-refactor-phase1 ba27f7667 -> 823a240eb
Merge branch 'master' into marvin-refactor-phase1
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/823a240e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/823a240e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/823a240e
Branch: refs/heads/marvin-refactor-phase1
Commit: 823a240eb41addecfacbc80dccb1f0209cecadde
Parents: d5b82b3 e13d932
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Jan 28 19:17:17 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jan 28 19:17:27 2013 +0530
----------------------------------------------------------------------
.../api/command/user/vm/UpgradeVMCmd.java | 4 +-
console-proxy/pom.xml | 18 +-
tools/cli/cloudmonkey/cachegen.py | 11 +-
tools/cli/cloudmonkey/cloudmonkey.py | 45 +-
tools/cli/cloudmonkey/common.py | 9 -
ui/scripts/ui-custom/recurringSnapshots.js | 3 +-
ui/scripts/ui/dialog.js | 335 ++++++++-------
7 files changed, 232 insertions(+), 193 deletions(-)
----------------------------------------------------------------------