incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [6/6] git commit: refs/heads/master - Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Tue, 19 Feb 2013 11:24:15 GMT
Updated Branches:
  refs/heads/master edac894f3 -> fb689e77f


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/fb689e77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fb689e77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fb689e77

Branch: refs/heads/master
Commit: fb689e77f1ac607764d52d36e7cd4c03103913f6
Parents: cead6d2 edac894
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Tue Feb 19 16:47:52 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Tue Feb 19 16:47:52 2013 +0530

----------------------------------------------------------------------
 .../cloud/configuration/ConfigurationService.java  |    2 +
 .../api/command/admin/ldap/LDAPConfigCmd.java      |   61 ++++++++++--
 .../api/response/LDAPConfigResponse.java           |    2 +-
 client/tomcatconf/componentContext.xml.in          |   13 +++
 docs/en-US/console-proxy.xml                       |    6 +-
 docs/en-US/working-with-system-vm.xml              |   56 ++++++-----
 .../cloud/agent/manager/MockAgentManagerImpl.java  |    2 +
 .../agent/manager/MockStorageManagerImpl.java      |    2 +
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   61 +++---------
 .../cloud/agent/manager/SimulatorManagerImpl.java  |   76 +++------------
 .../com/cloud/resource/SimulatorDiscoverer.java    |    2 +-
 .../resource/SimulatorSecondaryDiscoverer.java     |    2 +
 .../src/com/cloud/simulator/SimulatorGuru.java     |    7 +-
 .../simulator/dao/MockConfigurationDaoImpl.java    |   13 ++-
 .../com/cloud/simulator/dao/MockHostDaoImpl.java   |    6 +-
 .../cloud/simulator/dao/MockSecStorageDaoImpl.java |    6 +-
 .../simulator/dao/MockSecurityRulesDaoImpl.java    |   14 ++-
 .../simulator/dao/MockStoragePoolDaoImpl.java      |    6 +-
 .../src/com/cloud/simulator/dao/MockVMDaoImpl.java |   17 ++--
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |    9 +-
 .../xen/discoverer/XcpServerDiscoverer.java        |    1 +
 .../xen/resource/CitrixResourceBase.java           |   52 +++++------
 .../cloud/server/auth/LDAPUserAuthenticator.java   |    9 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    2 +-
 server/src/com/cloud/configuration/Config.java     |    4 +-
 .../configuration/ConfigurationManagerImpl.java    |   33 ++++++-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    4 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   10 +--
 server/src/com/cloud/resource/DiscovererBase.java  |    1 +
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   40 ++++----
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    9 ++
 setup/db/db/schema-410to420.sql                    |    1 +
 tools/appliance/README.md                          |   17 +++-
 tools/appliance/build.sh                           |   44 ++++++++-
 .../definitions/systemvmtemplate/preseed.cfg       |   64 ++++++++++--
 35 files changed, 388 insertions(+), 266 deletions(-)
----------------------------------------------------------------------



Mime
View raw message