Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0f0d7667 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0f0d7667 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0f0d7667 Branch: refs/heads/NIFI-250 Commit: 0f0d766707aa98a2302528ab1acfc84f48f69dad Parents: e63268a 7a9c8e2 Author: Mark Payne <[email protected]> Authored: Thu Mar 12 15:44:18 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Thu Mar 12 15:44:18 2015 -0400 ---------------------------------------------------------------------- nifi/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
