knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [24/24] knox git commit: Merge branch 'KNOX-481' of https://git-wip-us.apache.org/repos/asf/knox into KNOX-481
Date Fri, 30 Jan 2015 02:04:02 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/impl/DispatchDeploymentContributor.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/HiveDispatchDeploymentContributor.java
	gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
	gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java


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

Branch: refs/heads/KNOX-481
Commit: 749a57fc4e6514a4350313832d866a5d0c436c4b
Parents: 635e1c7 78a4f9a
Author: Sumit Gupta <sumit@apache.org>
Authored: Thu Jan 29 21:03:16 2015 -0500
Committer: Sumit Gupta <sumit@apache.org>
Committed: Thu Jan 29 21:03:16 2015 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message