You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2018/06/14 22:24:09 UTC
[4/4] nifi-fds git commit: Merge branch 'NIFI-5240-RC3' into
apache-master
Merge branch 'NIFI-5240-RC3' into apache-master
This closes #5240
Project: http://git-wip-us.apache.org/repos/asf/nifi-fds/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-fds/commit/f6d085c2
Tree: http://git-wip-us.apache.org/repos/asf/nifi-fds/tree/f6d085c2
Diff: http://git-wip-us.apache.org/repos/asf/nifi-fds/diff/f6d085c2
Branch: refs/heads/master
Commit: f6d085c2a238cf1db6a8a01ab536183ae4b00f9b
Parents: 92d0554 4f62f3d
Author: Scott Aslan <sc...@gmail.com>
Authored: Thu Jun 14 18:22:27 2018 -0400
Committer: Scott Aslan <sc...@gmail.com>
Committed: Thu Jun 14 18:22:27 2018 -0400
----------------------------------------------------------------------
package-lock.json | 295 +++++++++++++++++++-----------------
package.json | 2 +-
src/platform/core/package.json | 2 +-
3 files changed, 159 insertions(+), 140 deletions(-)
----------------------------------------------------------------------