You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/01/27 18:17:20 UTC
[13/15] git commit: Merge branch 'master' into events-framework
Merge branch 'master' into events-framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c650d7b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c650d7b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c650d7b4
Branch: refs/heads/events-framework
Commit: c650d7b474e3fad2903b9150dcb356c4d17ac34a
Parents: 73e6efd 1509a21
Author: Murali Reddy <mu...@citrix.com>
Authored: Sun Jan 27 03:17:41 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Sun Jan 27 03:17:41 2013 +0530
----------------------------------------------------------------------
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +-
setup/db/create-schema.sql | 1 +
setup/db/db/schema-40to410.sql | 2 +
ui/scripts/accounts.js | 8 +-
ui/scripts/system.js | 7 +
ui/scripts/ui-custom/instanceWizard.js | 15 +-
ui/scripts/ui/dialog.js | 335 ++++++++-------
7 files changed, 211 insertions(+), 159 deletions(-)
----------------------------------------------------------------------