Merge branch 'develop' into bootstrap
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d1271a28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d1271a28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d1271a28 Branch: refs/heads/bootstrap Commit: d1271a281e79a714a1c098465e29ef2925675e2b Parents: 2a2f0f0 67354bd Author: Mark Payne <[email protected]> Authored: Fri Dec 12 10:31:50 2014 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Dec 12 10:31:50 2014 -0500 ---------------------------------------------------------------------- .gitignore | 1 + .../repository/TestStandardProcessSession.java | 4 ++++ .../web/nifi-web-api/nb-configuration.xml | 18 ------------------ .../provenance/VolatileProvenanceRepository.java | 2 ++ 4 files changed, 7 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
