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 2013/11/04 23:36:20 UTC
[12/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Merge branch 'asf-master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0e8fa35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0e8fa35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0e8fa35
Branch: refs/heads/ui-restyle
Commit: d0e8fa35c23301ecb91e3f12231eaa14723eb818
Parents: b7259a4 eb9cfff
Author: Brian Federle <br...@citrix.com>
Authored: Mon Nov 4 14:36:01 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Nov 4 14:36:01 2013 -0800
----------------------------------------------------------------------
agent/pom.xml | 33 ++++++++++++
.../cloud/agent/dao/impl/PropertiesStorage.java | 57 ++++++++++----------
.../com/cloud/agent/dhcp/FakeDhcpSnooper.java | 5 --
agent/src/com/cloud/agent/mockvm/MockVm.java | 7 ---
.../consoleproxy/ConsoleProxyResource.java | 20 ++-----
.../classes/resources/messages.properties | 8 +--
.../storage/image/TemplateServiceImpl.java | 48 +++++++++++++----
engine/storage/integration-test/pom.xml | 33 ++++++++++++
.../test/resources/storageContext.xml | 3 --
.../storage/volume/VolumeServiceImpl.java | 53 +++++++++++++-----
parents/checkstyle/pom.xml | 18 ++++++-
.../src/main/resources/tooling/checkstyle.xml | 18 +++++++
.../debian/config/etc/logrotate.d/cloud | 11 ----
.../management/ProviderTestConfiguration.java | 26 +++++++--
.../PublicNetworkTestConfiguration.java | 26 +++++++--
.../test/resources/providerContext.xml | 18 +++++++
.../test/resources/publicNetworkContext.xml | 10 ++++
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 37 ++++++++++++-
pom.xml | 1 +
server/pom.xml | 33 ++++++++++++
.../storage/download/DownloadMonitorImpl.java | 6 ++-
.../patches/debian/config/etc/logrotate.d/cloud | 27 ++++++++++
ui/dictionary.jsp | 2 +
ui/scripts/network.js | 2 +-
ui/scripts/system.js | 16 +++---
usage/pom.xml | 33 ++++++++++++
27 files changed, 431 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e8fa35/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e8fa35/ui/dictionary.jsp
----------------------------------------------------------------------