Merge branch 'develop' of https://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/e1aa4890 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e1aa4890 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e1aa4890 Branch: refs/heads/master Commit: e1aa4890a003309f8a9038cd05f47af54aff4452 Parents: f0a5c11 b70845b Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Wed May 6 10:58:54 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Wed May 6 10:58:54 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++----- .../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++-------- 2 files changed, 34 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
