Updated Branches: refs/heads/master 7e7514053 -> b896bdb7e
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/b896bdb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b896bdb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b896bdb7 Branch: refs/heads/master Commit: b896bdb7ecfdeb9210c08be8780cde7db5fdbf23 Parents: b34760b 7e75140 Author: David Nalley <[email protected]> Authored: Wed Sep 26 02:14:07 2012 -0400 Committer: David Nalley <[email protected]> Committed: Wed Sep 26 02:14:07 2012 -0400 ---------------------------------------------------------------------- server/src/com/cloud/configuration/Config.java | 2 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 15 ++++++++++----- setup/db/db/schema-302to40.sql | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
