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/20bbaf01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/20bbaf01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/20bbaf01 Branch: refs/heads/master Commit: 20bbaf01ce93755cd11164ba7f00e9b8af528cbd Parents: 444dba6 fa414bb Author: Chip Childers <[email protected]> Authored: Mon Jul 9 16:42:16 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Jul 9 16:42:16 2012 -0400 ---------------------------------------------------------------------- build/replace.properties | 12 ++++++++++++ setup/db/deploy-db-clouddev.sh | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
