You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/23 08:52:40 UTC
[2/4] git commit: updated refs/heads/master to 0642a69
Merge pull request #1745 from shapeblue/CLOUDSTACK-9503
CLOUDSTACK-9503: Increased the VR script timeout. Most of the changes are about converting int/long time values to joda Duration.
* pr/1745:
CLOUDSTACK-9503: Increased the VR script timeout. Most of the changes are about converting int/long time values to joda Duration.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff616e70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff616e70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff616e70
Branch: refs/heads/master
Commit: ff616e700b208d08c3922bc8e052a84b60d8f436
Parents: 3b59a9b 83b5a8b
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 23 13:41:52 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 23 13:41:52 2016 +0530
----------------------------------------------------------------------
.../resource/virtualnetwork/VRScripts.java | 5 ++++-
.../virtualnetwork/VirtualRouterDeployer.java | 5 +++--
.../virtualnetwork/VirtualRoutingResource.java | 15 ++++++++-------
.../VirtualRoutingResourceTest.java | 5 +++--
.../resource/HypervDirectConnectResource.java | 9 +++++----
.../kvm/resource/LibvirtComputingResource.java | 14 ++++++++------
.../LibvirtOvsCreateTunnelCommandWrapper.java | 12 ++++--------
.../LibvirtPvlanSetupCommandWrapper.java | 5 +++--
.../resource/LibvirtComputingResourceTest.java | 20 +++++++++-----------
.../resources/Ovm3VirtualRoutingResource.java | 8 +++++---
.../vmware/resource/VmwareResource.java | 8 +++++---
.../xenserver/resource/CitrixResourceBase.java | 8 +++++---
.../java/com/cloud/utils/script/Script.java | 18 +++++++++++++++++-
.../java/com/cloud/utils/ssh/SshHelper.java | 10 ++++++++--
14 files changed, 87 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff616e70/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff616e70/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------