You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2018/12/18 01:29:40 UTC
asterixdb git commit: [NO ISSUE][OTH] No SSL in
AsterixHyracksIntegrationUtil
Repository: asterixdb
Updated Branches:
refs/heads/master c5b5deb94 -> a00d03954
[NO ISSUE][OTH] No SSL in AsterixHyracksIntegrationUtil
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Revert AsterixHyracksIntegrationUtil back to no SSL connections.
SslAsterixHyracksIntegrationUtil can be used for SSL connections.
Change-Id: Idbc1214aeac89c08bef4cb762e11e92549b0a25a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3094
Reviewed-by: Ali Alsuliman <al...@gmail.com>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/a00d0395
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/a00d0395
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/a00d0395
Branch: refs/heads/master
Commit: a00d0395481c8ef461561ef508af19742fd6edc5
Parents: c5b5deb
Author: Murtadha Hubail <mh...@apache.org>
Authored: Tue Dec 18 02:12:14 2018 +0300
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Mon Dec 17 17:29:10 2018 -0800
----------------------------------------------------------------------
.../apache/asterix/api/common/AsterixHyracksIntegrationUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a00d0395/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 6cc4677..9c24821 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -72,7 +72,7 @@ public class AsterixHyracksIntegrationUtil {
public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
public static final String RESOURCES_PATH = joinPath(getProjectPath().toString(), "src", "test", "resources");
- public static final String DEFAULT_CONF_FILE = joinPath(RESOURCES_PATH, "cc-ssl.conf");
+ public static final String DEFAULT_CONF_FILE = joinPath(RESOURCES_PATH, "cc.conf");
private static final String DEFAULT_STORAGE_PATH = joinPath("target", "io", "dir");
private static String storagePath = DEFAULT_STORAGE_PATH;
private static final long RESULT_TTL = TimeUnit.MINUTES.toMillis(5);