You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2015/01/07 10:17:12 UTC
[1/2] git commit: updated refs/heads/master to a520309
Repository: cloudstack
Updated Branches:
refs/heads/master 01a325b2b -> a52030919
Increased SSL handshake timeout to 30 seconds
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc17e4ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc17e4ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc17e4ef
Branch: refs/heads/master
Commit: dc17e4ef39e8422a4e86eb0d2976ae3b4e380867
Parents: 01a325b
Author: Kishan Kavala <ki...@cloud.com>
Authored: Wed Apr 16 23:55:26 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Wed Jan 7 14:27:51 2015 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/nio/Link.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc17e4ef/utils/src/com/cloud/utils/nio/Link.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
index a15b8a4..0127ec7 100644
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -465,7 +465,7 @@ public class Link {
ByteBuffer out_pkgBuf = ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
ByteBuffer out_appBuf = ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
int count;
- ch.socket().setSoTimeout(10 * 1000);
+ ch.socket().setSoTimeout(30 * 1000);
InputStream inStream = ch.socket().getInputStream();
// Use readCh to make sure the timeout on reading is working
ReadableByteChannel readCh = Channels.newChannel(inStream);
[2/2] git commit: updated refs/heads/master to a520309
Posted by ki...@apache.org.
Bug-Id: CLOUDSTACK-7395: reverted 0560254c04425705530a23a93002daede4b6dc3c partially. Allow multiple networks with LB service
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5203091
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5203091
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5203091
Branch: refs/heads/master
Commit: a5203091902f2be033663358b8d5083b6488b879
Parents: dc17e4e
Author: Kishan Kavala <ki...@apache.org>
Authored: Mon Dec 15 17:18:09 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Wed Jan 7 14:33:31 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5203091/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index fbb94c7..6bc75e4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1309,9 +1309,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
continue;
} else {
NetworkOffering otherOff = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());
- //throw only if networks have different offerings with public lb support
- if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb() &&
- guestNtwkOff.getId() != otherOff.getId()) {
+ if (_ntwkModel.areServicesSupportedInNetwork(network.getId(), Service.Lb) && otherOff.getPublicLb()) {
throw new InvalidParameterValueException("Public LB service is already supported " + "by network " + network + " in VPC " + vpc);
}
}