You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/19 13:33:34 UTC

[05/43] incubator-nifi git commit: Merge branch 'develop' into bootstrap

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/nifi-27
Commit: d1271a281e79a714a1c098465e29ef2925675e2b
Parents: 2a2f0f0 67354bd
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:31:50 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
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(-)
----------------------------------------------------------------------