Merge branch 'nifi-27' 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/5527ccbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5527ccbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5527ccbe Branch: refs/heads/develop Commit: 5527ccbe945336ca14208c27fa59599612790573 Parents: fe3d1a4 d5b20d4 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Wed Dec 17 10:12:42 2014 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Wed Dec 17 10:12:42 2014 -0500 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------