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/02/12 18:49:51 UTC
[6/6] 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/config/impl/GatewayConfigImpl.java
gateway-service-definitions/src/main/java/org/apache/hadoop/gateway/service/definition/ServiceDefinition.java
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/a1d43564
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/a1d43564
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/a1d43564
Branch: refs/heads/KNOX-481
Commit: a1d43564d67168725cbee477c4280d7962f8a99b
Parents: ea28bf2 9e0e3e8
Author: Sumit Gupta <su...@apache.org>
Authored: Thu Feb 12 12:49:15 2015 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Thu Feb 12 12:49:15 2015 -0500
----------------------------------------------------------------------
.../gateway/config/impl/GatewayConfigImpl.java | 10 -----
.../service/definition/ServiceDefinition.java | 46 --------------------
2 files changed, 56 deletions(-)
----------------------------------------------------------------------