Merge branch 'NIFI-593' 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/b70845b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b70845b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b70845b3 Branch: refs/heads/master Commit: b70845b31e8ff49cfe958c53feb9752b8dac0aa7 Parents: 251f0e5 1381920 Author: Aldrin Piri <ald...@apache.org> Authored: Wed May 6 09:11:24 2015 -0400 Committer: Aldrin Piri <ald...@apache.org> Committed: Wed May 6 09:11:24 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++----- .../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++-------- 2 files changed, 34 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
