You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2015/01/06 20:25:48 UTC
[7/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f
Merge branch 'master' into ui-template-uploader
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d9542ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d9542ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d9542ff
Branch: refs/heads/ui-template-uploader
Commit: 6d9542ff36b9fd47be9f7de03e1249622c7f49a6
Parents: 7bcbf09 3cba1c4
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 6 11:25:21 2015 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 6 11:25:21 2015 -0800
----------------------------------------------------------------------
.../cloud/deploy/ImplicitDedicationPlanner.java | 2 --
plugins/hypervisors/hyperv/pom.xml | 3 --
plugins/user-authenticators/ldap/pom.xml | 2 +-
pom.xml | 38 +++++++++++++-------
server/src/com/cloud/configuration/Config.java | 6 ++--
.../configuration/ConfigurationManagerImpl.java | 12 +++----
.../consoleproxy/ConsoleProxyManagerImpl.java | 18 +++++-----
.../network/vpn/RemoteAccessVpnManagerImpl.java | 3 --
server/src/com/cloud/vm/UserVmManagerImpl.java | 6 ++--
.../SecondaryStorageManagerImpl.java | 20 +++++++----
setup/db/db/schema-442to450.sql | 2 ++
tools/checkstyle/pom.xml | 8 ++++-
12 files changed, 69 insertions(+), 51 deletions(-)
----------------------------------------------------------------------