Merge branch 'develop' into ListHDFS
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/00b686b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/00b686b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/00b686b0 Branch: refs/heads/develop Commit: 00b686b0b2a66d4b238a1af0602edae6a36d7786 Parents: 3e767fb 8c00623 Author: Mark Payne <[email protected]> Authored: Tue Apr 28 10:13:11 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Apr 28 10:13:11 2015 -0400 ---------------------------------------------------------------------- .../client/socket/EndpointConnectionPool.java | 2 +- .../nifi/processors/standard/GetHTTP.java | 11 ++-- .../DistributedMapCacheClientService.java | 2 + .../DistributedSetCacheClientService.java | 2 + .../additionalDetails.html | 45 ------------- .../additionalDetails.html | 46 -------------- .../index.html | 67 -------------------- .../additionalDetails.html | 49 -------------- 8 files changed, 11 insertions(+), 213 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/00b686b0/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java ----------------------------------------------------------------------
