Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f0c660c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f0c660c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f0c660c2 Branch: refs/heads/NIFI-250 Commit: f0c660c25ee0e2b1a6acd9b8e876144cad9b0d6b Parents: b45c09c e569af6 Author: Mark Payne <[email protected]> Authored: Wed Mar 18 10:12:13 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Mar 18 10:12:13 2015 -0400 ---------------------------------------------------------------------- .../PersistentProvenanceRepository.java | 10 +++-- .../TestPersistentProvenanceRepository.java | 40 ++++++++++---------- 2 files changed, 26 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
