You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/08/04 14:56:09 UTC
[2/2] nifi git commit: Merge branch 'develop' into NIFI-800
Merge branch 'develop' into NIFI-800
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/15d49025
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/15d49025
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/15d49025
Branch: refs/heads/develop
Commit: 15d49025f21a3263fab797c758c2f95bc18df2b4
Parents: 34e08ba 2600877
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Aug 4 08:54:58 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Aug 4 08:55:47 2015 -0400
----------------------------------------------------------------------
.../authorization/DownloadAuthorization.java | 2 +-
nifi/nifi-bootstrap/pom.xml | 37 +-
.../nifi-hl7-query-language/pom.xml | 6 +-
.../org/wali/MinimalLockingWriteAheadLog.java | 3 +-
nifi/nifi-docs/pom.xml | 19 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 4 -
.../nifi-flume-bundle/nifi-flume-nar/pom.xml | 3 +-
.../nifi-flume-processors/pom.xml | 32 +-
nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml | 29 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 11 +-
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 4 +-
.../nifi-kafka-processors/pom.xml | 1 -
.../PersistentProvenanceRepository.java | 210 ++++---
.../nifi/provenance/StandardRecordReader.java | 8 +-
.../nifi/provenance/StandardRecordWriter.java | 24 +-
.../provenance/serialization/RecordWriter.java | 12 +-
.../TestPersistentProvenanceRepository.java | 120 +++-
.../nifi-twitter-processors/pom.xml | 2 -
.../nifi-standard-processors/pom.xml | 553 +++++++++----------
.../nifi-dbcp-service/pom.xml | 28 +-
.../nifi-http-context-map/pom.xml | 4 +-
.../nifi-standard-services-api-nar/pom.xml | 11 +-
24 files changed, 669 insertions(+), 458 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/15d49025/nifi/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
----------------------------------------------------------------------
diff --cc nifi/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
index 39fe65a,5c8b4c8..a5889ed
--- a/nifi/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
+++ b/nifi/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/MinimalLockingWriteAheadLog.java
@@@ -60,7 -60,7 +60,6 @@@ import java.util.regex.Pattern
import org.apache.nifi.stream.io.BufferedInputStream;
import org.apache.nifi.stream.io.BufferedOutputStream;
- import org.apache.nifi.stream.io.ByteCountingInputStream;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;