You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by de...@apache.org on 2015/04/08 20:05:26 UTC

[11/14] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

Merge branch 'develop' of http://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/39735c30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/39735c30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/39735c30

Branch: refs/heads/NIFI-433
Commit: 39735c30bcf2dccb090dd8c60a8668c27d9c7517
Parents: c974ea9 7369730
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Apr 7 12:46:48 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 7 12:46:48 2015 -0400

----------------------------------------------------------------------
 .../service/StandardControllerServiceNode.java      |  2 +-
 .../js/jquery/propertytable/jquery.propertytable.js | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------