cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/master to 1c408de
Date Thu, 07 May 2015 14:05:28 GMT
Merge branch '4.5' after 4.5.1 vote passes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c408dec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c408dec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c408dec

Branch: refs/heads/master
Commit: 1c408dec37a278c97c1b40da0bdbca437d7a564c
Parents: 5ba904a 4ba72a8
Author: Daan Hoogland <daan.hoogland@gmail.com>
Authored: Thu May 7 16:03:26 2015 +0200
Committer: Daan Hoogland <daan.hoogland@gmail.com>
Committed: Thu May 7 16:03:26 2015 +0200

----------------------------------------------------------------------
 build/replace.properties                          |  2 +-
 .../classes/resources/messages_fr_FR.properties   |  1 +
 debian/rules                                      |  2 +-
 .../cloud/agent/manager/DirectAgentAttache.java   |  6 ++----
 .../storage/volume/VolumeServiceImpl.java         |  1 +
 .../framework/jobs/impl/AsyncJobManagerImpl.java  |  2 +-
 packaging/centos63/cloud.spec                     |  3 +++
 .../centos63/rhel7/cloudstack-management.conf     | 18 ++++++++++++++++++
 .../baremetal/manager/BaremetalManagerImpl.java   | 10 ++++++++++
 .../deploy/DeploymentPlanningManagerImpl.java     |  1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java    |  2 ++
 test/integration/component/test_ss_limits.py      |  2 +-
 test/integration/component/test_usage.py          |  1 +
 test/integration/component/test_vpc_network.py    |  2 +-
 test/integration/smoke/test_volumes.py            | 11 ++++++++++-
 tools/build/build_asf.sh                          |  2 +-
 tools/marvin/marvin/deployAndRun.py               |  2 +-
 ui/dictionary2.jsp                                |  1 +
 18 files changed, 57 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/build/replace.properties
----------------------------------------------------------------------
diff --cc build/replace.properties
index d2dc587,7540b31..dd7e533
--- a/build/replace.properties
+++ b/build/replace.properties
@@@ -25,5 -25,6 +25,5 @@@ AGENTLOGDIR=log
  AGENTLOG=logs/agent.log
  MSMNTDIR=/mnt
  COMPONENTS-SPEC=components.xml
 -AWSAPILOG=awsapi.log
  REMOTEHOST=localhost
- COMMONLIBDIR=client/target/cloud-client-ui-4.5.0-SNAPSHOT/WEB-INF/lib/
+ COMMONLIBDIR=client/target/cloud-client-ui-4.5.1-SNAPSHOT/WEB-INF/lib/

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/debian/rules
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
----------------------------------------------------------------------
diff --cc engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
index f39bf1d,52dfa9f..52dfa9f
mode 100644,100755..100644
--- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --cc engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index a2fd656,3483544..96771d1
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@@ -81,8 -78,8 +81,9 @@@ import com.cloud.exception.ConcurrentOp
  import com.cloud.exception.ResourceAllocationException;
  import com.cloud.host.Host;
  import com.cloud.host.dao.HostDao;
 +import com.cloud.hypervisor.Hypervisor.HypervisorType;
  import com.cloud.storage.DataStoreRole;
+ import com.cloud.storage.RegisterVolumePayload;
  import com.cloud.storage.ScopeType;
  import com.cloud.storage.Storage.StoragePoolType;
  import com.cloud.storage.StoragePool;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/packaging/centos63/cloud.spec
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
index f826ae9,f95ad80..85f79e3
mode 100644,100755..100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 44a8ac4,c290e9c..9d40b6f
mode 100644,100755..100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index 38ca390,13ed97e..5bee109
mode 100644,100755..100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/test/integration/component/test_ss_limits.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --cc test/integration/component/test_usage.py
index 5eb4c74,262a371..71b9437
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@@ -37,10 -37,9 +37,11 @@@ from marvin.lib.base import (Account
                               Volume)
  from marvin.lib.common import (get_zone,
                                 get_domain,
 -                               get_template)
 +                               get_template,
 +                               find_storage_pool_type)
 +
  
+ 
  class Services:
  
      """Test Snapshots Services

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c408dec/ui/dictionary2.jsp
----------------------------------------------------------------------


Mime
View raw message