You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/03/13 22:24:11 UTC
[1/2] brooklyn-server git commit: Fix ssh login when provider's image
requires TTY
Repository: brooklyn-server
Updated Branches:
refs/heads/master 82058cf7a -> e317fc5a1
Fix ssh login when provider's image requires TTY
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/855fe893
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/855fe893
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/855fe893
Branch: refs/heads/master
Commit: 855fe8930f28accf416df0b434cc82a32b7f1eb2
Parents: f218966
Author: Yavor Yanchev <ya...@yanchev.com>
Authored: Mon Mar 13 17:11:16 2017 +0200
Committer: Yavor Yanchev <ya...@yanchev.com>
Committed: Mon Mar 13 17:11:16 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/855fe893/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 600a710..121d5dd 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1707,6 +1707,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
// can cause the VM to reboot shortly after it was ssh'able.
Map<String,Object> execProps = Maps.newLinkedHashMap();
execProps.put(ShellTool.PROP_RUN_AS_ROOT.getName(), true);
+ execProps.put(SshTool.PROP_ALLOCATE_PTY.getName(), true);
execProps.put(SshTool.PROP_SSH_TRIES.getName(), 50);
execProps.put(SshTool.PROP_SSH_TRIES_TIMEOUT.getName(), 10*60*1000);
[2/2] brooklyn-server git commit: This closes #591
Posted by al...@apache.org.
This closes #591
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e317fc5a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e317fc5a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e317fc5a
Branch: refs/heads/master
Commit: e317fc5a1e74e35e36b0d58ee9e2d9f1d8c71d9b
Parents: 82058cf 855fe89
Author: Aled Sage <al...@gmail.com>
Authored: Mon Mar 13 22:17:10 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Mar 13 22:17:10 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------