Merge branch 'master' of https://github.com/apache/nifi
(Apologies for merge commits, but it was not possible to rebase the 2574 commits (PR 872)). Signed-off-by: Andy LoPresto <alopre...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0ffdc2eb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0ffdc2eb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0ffdc2eb Branch: refs/heads/master Commit: 0ffdc2eb927ee8c78104f51bce9d2c45a1025121 Parents: b2e468e a0d1aae Author: Andy LoPresto <alopre...@apache.org> Authored: Wed Aug 17 10:52:43 2016 -0700 Committer: Andy LoPresto <alopre...@apache.org> Committed: Wed Aug 17 10:58:38 2016 -0700 ---------------------------------------------------------------------- .../processors/standard/QueryDatabaseTable.java | 174 +++++++++++++----- .../processors/standard/util/JdbcCommon.java | 9 +- .../standard/QueryDatabaseTableTest.java | 182 ++++++++++++++++++- 3 files changed, 319 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
