Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1509a210 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1509a210 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1509a210 Branch: refs/heads/events-framework Commit: 1509a210ca32f4f46047d19829b5a41aa72edc80 Parents: 76b2880 17c419c Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Sat Jan 26 23:48:57 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Sat Jan 26 23:48:57 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/ui-custom/instanceWizard.js | 15 +++++++++++++-- 4 files changed, 17 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
