knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [41/41] knox git commit: Fixed issues with merge
Date Thu, 12 Feb 2015 16:22:23 GMT
Fixed issues with merge


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

Branch: refs/heads/KNOX-481
Commit: 9e0e3e8ceb06d33bc2f504d8f254954f15af586d
Parents: 37963dc
Author: Sumit Gupta <sumit@apache.org>
Authored: Thu Feb 12 11:21:20 2015 -0500
Committer: Sumit Gupta <sumit@apache.org>
Committed: Thu Feb 12 11:21:20 2015 -0500

----------------------------------------------------------------------
 .../gateway/config/impl/GatewayConfigImpl.java      | 16 ----------------
 .../deploy/impl/DispatchDeploymentContributor.java  |  2 +-
 .../hadoop/gateway/dispatch/HttpClientDispatch.java |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/9e0e3e8c/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
index f935533..d34cbb4 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
@@ -167,24 +167,8 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig
{
 
   @Override
   public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks"
);
-  }
-
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks"
);
-  }
-
-  @Override
-  public String getGatewayStacksDir() {
     return getGatewayDataDir() + File.separator + STACKS_SERVICES_DIRECTORY;
   }
-
-  @Override
-  public String getGatewayStacksDir() {
-    return getVar( GATEWAY_DATA_HOME_VAR, getGatewayHomeDir() + File.separator + "stacks"
);
-  }
-
   @Override
   public String getHadoopConfDir() {
     return get( HADOOP_CONF_DIR );

http://git-wip-us.apache.org/repos/asf/knox/blob/9e0e3e8c/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/DispatchDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/DispatchDeploymentContributor.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/DispatchDeploymentContributor.java
index 4d272c2..30f2c65 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/DispatchDeploymentContributor.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/DispatchDeploymentContributor.java
@@ -37,7 +37,7 @@ public class DispatchDeploymentContributor extends ProviderDeploymentContributor
   private static final String DISPATCH_IMPL_PARAM = "dispatch-impl";
 
   // Default global replay buffer size in KB
-  public static final String DEFAULT_REPLAY_BUFFER_SIZE = "4";
+  public static final String DEFAULT_REPLAY_BUFFER_SIZE = "8";
 
   @Override
   public String getRole() {

http://git-wip-us.apache.org/repos/asf/knox/blob/9e0e3e8c/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
index 8c5b4f9..e5810d4 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
@@ -301,7 +301,7 @@ public class HttpClientDispatch extends AbstractGatewayDispatch {
    }
 
    @Configure
-   protected void setReplayBufferSize(@Default("4") int size) {
+   protected void setReplayBufferSize(@Default("8") int size) {
       replayBufferSize = size;
    }
 


Mime
View raw message