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/f7ecb47e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f7ecb47e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f7ecb47e Branch: refs/heads/master Commit: f7ecb47e29f92e4c7790358cb6205c6c13606141 Parents: 9e39653 a68f87f Author: Mark Payne <[email protected]> Authored: Wed Mar 23 11:24:28 2016 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Mar 23 11:24:28 2016 -0400 ---------------------------------------------------------------------- .../apache/nifi/processor/util/bin/BinFiles.java | 16 +++++++++++++--- .../org/apache/nifi/processors/kafka/GetKafka.java | 6 +++--- 2 files changed, 16 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
