Merge branch 'NIFI-793' into NIFI-744
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b8cee510 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b8cee510 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b8cee510 Branch: refs/heads/NIFI-744 Commit: b8cee51052ff967a193c9a1876fa5ad39bdd3c4c Parents: 301078b f260ec7 Author: Mark Payne <[email protected]> Authored: Thu Jul 30 09:55:35 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Thu Jul 30 09:55:35 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 1 + .../org/apache/nifi/util/NiFiProperties.java | 1 + .../src/main/resources/conf/nifi.properties | 1 + .../PersistentProvenanceRepository.java | 146 +++++++++++++++---- .../provenance/RepositoryConfiguration.java | 34 +++-- 5 files changed, 143 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
