Repository: incubator-nifi Updated Branches: refs/heads/NIFI-271 3c3306b71 -> 8a296aacc
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-271 Commit: 39735c30bcf2dccb090dd8c60a8668c27d9c7517 Parents: c974ea9 7369730 Author: Mark Payne <[email protected]> Authored: Tue Apr 7 12:46:48 2015 -0400 Committer: Mark Payne <[email protected]> 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(-) ----------------------------------------------------------------------
