Merge branch 'develop' of https://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/69297a3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/69297a3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/69297a3a Branch: refs/heads/master Commit: 69297a3aa0608e3be3b6d609e623b0b7bef263d6 Parents: 0df351d 0c5b78f Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Wed Jun 24 09:15:27 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Wed Jun 24 09:15:27 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/ExtractText.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
