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/684ed8e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/684ed8e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/684ed8e1 Branch: refs/heads/develop Commit: 684ed8e1f5c3b3b2d440990e88e02b3d60a24fbd Parents: 40438f1 22ded80 Author: Matt Gilman <[email protected]> Authored: Sun May 3 19:51:36 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Sun May 3 19:51:36 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 7 +++++++ .../repository/StandardProcessSession.java | 16 ++++++++-------- .../provenance/PersistentProvenanceRepository.java | 3 ++- 3 files changed, 17 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
