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/05/30 08:58:02 UTC
[1/2] brooklyn-server git commit: Getting the correct value for
WinRmMachineLocation.USE_HTTPS_WINRM
Repository: brooklyn-server
Updated Branches:
refs/heads/master 280d0ce05 -> dd6d9b78b
Getting the correct value for WinRmMachineLocation.USE_HTTPS_WINRM
- the config still doesn't contain the correct value for
USE_HTTPS_WINRM, when it is set via provisioning.properties
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a5a20ac5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a5a20ac5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a5a20ac5
Branch: refs/heads/master
Commit: a5a20ac5984d74f07e4db4318d855e10e2d5a5ca
Parents: e7cd823
Author: Yavor Yanchev <ya...@yanchev.com>
Authored: Tue May 30 11:43:11 2017 +0300
Committer: Yavor Yanchev <ya...@yanchev.com>
Committed: Tue May 30 11:43:11 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a5a20ac5/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 074ec5f..f97518d 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
@@ -766,7 +766,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
if (windows) {
int newLoginPort = node.getLoginPort() == 22
- ? (getConfig(WinRmMachineLocation.USE_HTTPS_WINRM) ? 5986 : 5985)
+ ? (setup.get(WinRmMachineLocation.USE_HTTPS_WINRM) ? 5986 : 5985)
: node.getLoginPort();
String newLoginUser = "root".equals(node.getCredentials().getUser())
? "Administrator"
[2/2] brooklyn-server git commit: This closes #708
Posted by al...@apache.org.
This closes #708
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dd6d9b78
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dd6d9b78
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dd6d9b78
Branch: refs/heads/master
Commit: dd6d9b78bba3d45ca63ce84349b481cef37efb66
Parents: 280d0ce a5a20ac
Author: Aled Sage <al...@gmail.com>
Authored: Tue May 30 09:57:41 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 30 09:57:41 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------