You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/08/19 19:30:48 UTC
[2/2] nifi git commit: Merge branch 'nifi-868' of
https://github.com/pukkaone/nifi into NIFI-868
Merge branch 'nifi-868' of https://github.com/pukkaone/nifi into NIFI-868
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8ebf1f03
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8ebf1f03
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8ebf1f03
Branch: refs/heads/master
Commit: 8ebf1f03c212f7d38e83cd72e1373bfd1d8703f0
Parents: e345218 8f98f80
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Aug 19 12:56:26 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Aug 19 12:56:26 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/nifi/util/NiFiProperties.java | 11 +++++++++++
nifi-docs/src/main/asciidoc/administration-guide.adoc | 1 +
.../src/main/resources/conf/nifi.properties | 1 +
.../protocol/socket/SocketFlowFileServerProtocol.java | 8 +++++++-
.../src/test/resources/access-control/nifi.properties | 1 +
5 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8ebf1f03/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8ebf1f03/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8ebf1f03/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
----------------------------------------------------------------------