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/a6de1b42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a6de1b42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a6de1b42 Branch: refs/heads/develop Commit: a6de1b42504471f9f99aca8f8fe78f1cba85c8e1 Parents: c45dcf0 b38d74a Author: Mark Payne <[email protected]> Authored: Tue Jun 23 10:29:11 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Jun 23 10:29:11 2015 -0400 ---------------------------------------------------------------------- .../nifi/provenance/lineage/LineageNode.java | 1 + .../nifi/provenance/lineage/EventNode.java | 2 ++ .../nifi/provenance/lineage/FlowFileNode.java | 1 + .../org/apache/nifi/util/NiFiProperties.java | 22 ++++++++++++-------- 4 files changed, 17 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
