Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/89b0de85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/89b0de85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/89b0de85 Branch: refs/heads/develop Commit: 89b0de85729973ddcbc1e0aa0e467ab9dc74a17c Parents: 5b3709f 39735c3 Author: bbende <[email protected]> Authored: Tue Apr 7 18:29:38 2015 -0400 Committer: bbende <[email protected]> Committed: Tue Apr 7 18:29:38 2015 -0400 ---------------------------------------------------------------------- .../nifi/remote/client/socket/SocketClient.java | 8 +++++++- .../scheduling/StandardProcessScheduler.java | 8 +++++--- .../service/StandardControllerServiceNode.java | 2 +- .../apache/nifi/processor/SimpleProcessLogger.java | 2 +- .../js/jquery/propertytable/jquery.propertytable.js | 16 +++++++++++++++- 5 files changed, 29 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
