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/272fb90e
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/272fb90e
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/272fb90e
Branch: refs/heads/KNOX-481
Commit: 272fb90ed69cb50f166b48ab9bf6fc597f07061b
Parents: aeee64e a1d4356
Author: Sumit Gupta <su...@apache.org>
Authored: Thu Feb 12 21:16:51 2015 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Thu Feb 12 21:16:51 2015 -0500
----------------------------------------------------------------------
.../gateway/config/impl/GatewayConfigImpl.java | 10 -----
.../service/definition/ServiceDefinition.java | 46 --------------------
2 files changed, 56 deletions(-)
----------------------------------------------------------------------
