Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b82d1428 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b82d1428 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b82d1428 Branch: refs/heads/NIFI-632 Commit: b82d1428b24b40fc2f003655979969632e0f5b7f Parents: facc424 0b4cddb Author: Mark Payne <[email protected]> Authored: Mon Jun 8 20:22:48 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Mon Jun 8 20:22:48 2015 -0400 ---------------------------------------------------------------------- .../processors/standard/TestExecuteStreamCommand.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b82d1428/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java ----------------------------------------------------------------------
