Merge branch 'develop' into NIFI-85

Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/045afa5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/045afa5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/045afa5b

Branch: refs/heads/nifi-27
Commit: 045afa5b2e6c0d9ce96fd65387d659ce7ac3b47f
Parents: ca872ba 5527ccb
Author: Matt Gilman <[email protected]>
Authored: Wed Dec 17 10:15:47 2014 -0500
Committer: Matt Gilman <[email protected]>
Committed: Wed Dec 17 10:15:47 2014 -0500

----------------------------------------------------------------------
 .../nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to