Merge remote-tracking branch 'origin/master' # Conflicts: # gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/FilterParamDescriptorImpl.java
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7446fbc4 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7446fbc4 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7446fbc4 Branch: refs/heads/master Commit: 7446fbc4356f6a6d098d39d091f9c300b404646b Parents: 02f1b8b 335dbd9 Author: Sandeep More <[email protected]> Authored: Thu Mar 22 13:51:32 2018 -0400 Committer: Sandeep More <[email protected]> Committed: Thu Mar 22 13:51:32 2018 -0400 ---------------------------------------------------------------------- .../knox/gateway/descriptor/impl/FilterParamDescriptorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
