You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/26 13:15:18 UTC
[04/14] incubator-nifi git commit: Merge remote-tracking branch
'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' 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/5f3653b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5f3653b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5f3653b3
Branch: refs/heads/NIFI-250
Commit: 5f3653b342d3a6564d19c7b380b6a7e8cd81f6b1
Parents: 27f6918 2f4727d
Author: bbende <bb...@gmail.com>
Authored: Thu Jan 22 21:12:18 2015 -0500
Committer: bbende <bb...@gmail.com>
Committed: Thu Jan 22 21:12:18 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/web/controller/ControllerFacade.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------