incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [50/50] [abbrv] git commit: Merge branch 'master' into marvin-refactor-phase1
Date Sat, 26 Jan 2013 16:21:38 GMT
Updated Branches:
  refs/heads/marvin-refactor-phase1 f435ffb2e -> ba27f7667


Merge branch 'master' into marvin-refactor-phase1


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba27f766
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba27f766
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba27f766

Branch: refs/heads/marvin-refactor-phase1
Commit: ba27f766722c60692ed5ef105c976b57131dfd44
Parents: 7d4124c 17c419c
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jan 26 21:50:14 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jan 26 21:50:14 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 +++++++++++++--
 6 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



Mime
View raw message