Merge branch 'develop' into NIFI-632
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/46aa2685 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/46aa2685 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/46aa2685 Branch: refs/heads/NIFI-632 Commit: 46aa2685e3162ee6afbf68a0ac68d5206cb9c500 Parents: cad8aa1 3295f7f Author: danbress <dbr...@onyxconsults.com> Authored: Mon Jun 15 20:38:54 2015 -0400 Committer: danbress <dbr...@onyxconsults.com> Committed: Mon Jun 15 20:38:54 2015 -0400 ---------------------------------------------------------------------- nifi-site/Gruntfile.js | 2 +- nifi-site/src/pages/html/faq.hbs | 6 +-- nifi-site/src/pages/html/people.hbs | 5 ++ .../propertytable/jquery.propertytable.js | 51 +++++++++++++------- .../nifi-standard-processors/pom.xml | 8 ++- .../standard/AbstractJsonPathProcessor.java | 5 +- .../additionalDetails.html | 2 +- .../standard/TestEvaluateJsonPath.java | 19 ++++++++ .../resources/TestJson/control-characters.json | 7 +++ 9 files changed, 79 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
