Merge branch 'master' into marvin_refactor
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67f2008b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67f2008b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67f2008b Branch: refs/heads/marvin_refactor Commit: 67f2008be6a4c24df4f786ebf8466dcc5ce3030a Parents: 3bf8c11 0abfe24 Author: Prasanna Santhanam <[email protected]> Authored: Mon Apr 15 13:40:11 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon Apr 15 13:40:11 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_volumes.py | 55 ++++++++++++++++++++++----- ui/scripts/instances.js | 29 ++++++++++++++- 2 files changed, 73 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
