cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 664186f
Date Wed, 21 Jan 2015 12:35:17 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 0f84e042b -> 664186f48


CLOUDSTACK-5946: Fix keystore filename to avoid warning logs

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit ed69d588ec56735451f2427c48bcfc499f863b9c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: e7c80021d60a5f8deb7862c770da4d894686eb74
Parents: 0f84e04
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Jan 21 16:00:29 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Jan 21 18:04:00 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/e7c80021/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 0127ec7..904afbb 100644
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -65,7 +65,7 @@ public class Link {
     private boolean _gotFollowingPacket;
 
     private SSLEngine _sslEngine;
-    public static String keystoreFile = "/cloud.keystore";
+    public static String keystoreFile = "/cloudmanagementserver.keystore";
 
     public Link(InetSocketAddress addr, NioConnection connection) {
         _addr = addr;


Mime
View raw message