knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [40/41] knox git commit: Merge branch 'KNOX-481' of https://git-wip-us.apache.org/repos/asf/knox into KNOX-481
Date Thu, 12 Feb 2015 16:22:22 GMT
Merge branch 'KNOX-481' of https://git-wip-us.apache.org/repos/asf/knox into KNOX-481

Conflicts:
	gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
	gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java
	gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/CustomDispatch.java
	gateway-service-definitions/src/main/resources/services/hbase/0.98.0/service.xml
	gateway-service-definitions/src/main/resources/services/hive/0.13.0/service.xml
	gateway-service-definitions/src/main/resources/services/webhdfs/2.4.0/service.xml
	gateway-service-definitions/src/test/java/org/apache/hadoop/gateway/service/definition/ServiceDefinitionTest.java
	gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDeploymentContributor.java
	gateway-service-hbase/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDispatchDeploymentContributor.java
	gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDeploymentContributor.java
	gateway-service-hive/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatchDeploymentContributor.java
	gateway-service-oozie/src/main/java/org/apache/hadoop/gateway/oozie/OozieDeploymentContributor.java
	gateway-service-webhcat/src/main/java/org/apache/hadoop/gateway/webhcat/WebHCatDeploymentContributor.java
	gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor.java
	gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/WebHdfsDispatchDeploymentContributor.java
	gateway-service-webhdfs/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaHttpClientDispatch.java
	gateway-service-yarn-rm/src/main/java/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor.java
	gateway-spi/src/main/java/org/apache/hadoop/gateway/config/FilterConfigurationAdapter.java
	gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java
	gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
	gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/ConfigurationAdapter.java
	gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/impl/BeanConfigurationAdapter.java
	gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/impl/DefaultConfigurationInjector.java
	gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/impl/MapConfigurationAdapter.java
	gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/impl/PropertiesConfigurationAdapter.java
	gateway-util-configinjector/src/test/java/org/apache/hadoop/gateway/config/AdapterSampleTest.java
	gateway-util-configinjector/src/test/java/org/apache/hadoop/gateway/config/FuncTest.java
	gateway-util-configinjector/src/test/java/org/apache/hadoop/gateway/config/impl/BeanConfigurationAdapterTest.java
	pom.xml


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

Branch: refs/heads/KNOX-481
Commit: 37963dced984fba4e633ad9b919918d52e79c253
Parents: 7cb3551 749a57f
Author: Sumit Gupta <sumit@apache.org>
Authored: Wed Feb 11 16:09:52 2015 -0500
Committer: Sumit Gupta <sumit@apache.org>
Committed: Wed Feb 11 16:09:52 2015 -0500

----------------------------------------------------------------------
 .../apache/hadoop/gateway/config/impl/GatewayConfigImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/37963dce/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------


Mime
View raw message