Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4e2c94d6 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4e2c94d6 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4e2c94d6 Branch: refs/heads/NIFI-655 Commit: 4e2c94d6590e57b3aa7fa4a9180626a48b9ae2e2 Parents: 2516b1d b74617b Author: Mark Payne <[email protected]> Authored: Mon Nov 23 14:18:50 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Nov 23 14:18:50 2015 -0500 ---------------------------------------------------------------------- .../nifi/provenance/StandardLineageResult.java | 1 + .../StandardProvenanceEventRecord.java | 1 + .../asciidoc/images/nifi-connection-menu.png | Bin 0 -> 31189 bytes .../main/asciidoc/images/nifi-connection.png | Bin 0 -> 166905 bytes .../asciidoc/images/nifi-process-group-menu.png | Bin 0 -> 98964 bytes .../asciidoc/images/nifi-processor-menu.png | Bin 0 -> 99962 bytes .../src/main/asciidoc/images/nifi-rpg-menu.png | Bin 0 -> 108291 bytes nifi-docs/src/main/asciidoc/user-guide.adoc | 145 +++++-- .../repository/StandardProcessSession.java | 4 +- .../js/nf/provenance/nf-provenance-table.js | 5 + .../nifi-hbase-processors/pom.xml | 4 + .../nifi/hbase/AbstractHBaseProcessor.java | 23 - .../org/apache/nifi/hbase/AbstractPutHBase.java | 183 ++++++++ .../java/org/apache/nifi/hbase/GetHBase.java | 3 +- .../org/apache/nifi/hbase/PutHBaseCell.java | 153 +------ .../org/apache/nifi/hbase/PutHBaseJSON.java | 230 ++++++++++ .../org.apache.nifi.processor.Processor | 3 +- .../org/apache/nifi/hbase/HBaseTestUtil.java | 87 ++++ .../nifi/hbase/MockHBaseClientService.java | 14 +- .../org/apache/nifi/hbase/TestPutHBaseCell.java | 60 ++- .../org/apache/nifi/hbase/TestPutHBaseJSON.java | 423 +++++++++++++++++++ .../nifi/provenance/StandardRecordReader.java | 2 + .../nifi/provenance/StandardRecordWriter.java | 2 + .../standard/AbstractSyslogProcessor.java | 2 +- .../nifi/processors/standard/InvokeHTTP.java | 19 +- .../apache/nifi/hbase/HBaseClientService.java | 11 + .../org/apache/nifi/hbase/put/PutColumn.java | 47 +++ .../org/apache/nifi/hbase/put/PutFlowFile.java | 38 +- .../nifi/hbase/HBase_1_1_2_ClientService.java | 25 +- .../hbase/TestHBase_1_1_2_ClientService.java | 27 +- 30 files changed, 1257 insertions(+), 255 deletions(-) ----------------------------------------------------------------------
