You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by su...@apache.org on 2015/01/30 03:04:02 UTC
[24/24] knox git commit: Merge branch 'KNOX-481' of
https://git-wip-us.apache.org/repos/asf/knox into KNOX-481
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 <su...@apache.org>
Authored: Thu Jan 29 21:03:16 2015 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Thu Jan 29 21:03:16 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------