Matt Gilman 7314af6177 NIFI-259: - Addressing issues that arose from a merge conflict. ...

Signed-off-by: Aldrin Piri <aldrin@apache.org>

2016-02-05 17:47:56 -05:00

..

nifi-administration

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-client-dto

Merge branch 'master' into NIFI-259

2016-01-21 09:32:02 -05:00

nifi-cluster-authorization-provider

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-documentation

NIFI-259: Initial implementation of State Management feature

2016-01-11 16:38:52 -05:00

nifi-file-authorization-provider

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-framework-cluster

NIFI-259:

2016-01-21 16:35:59 -05:00

nifi-framework-cluster-protocol

NIFI-259: Bug Fix

2016-01-17 20:32:04 -05:00

nifi-framework-cluster-web

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-framework-core

Merge branch 'NIFI-259'

2016-02-05 14:09:29 -05:00

nifi-framework-core-api

Merge branch 'master' into NIFI-259

2016-01-21 09:32:02 -05:00

nifi-nar-utils

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-resources

NIFI-259: - Adding additional documentation for embedded ZK.

2016-02-03 10:13:19 -05:00

nifi-runtime

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-security

NIFI-1354 Using the newly generated keystore and truststore throughout the code base and updating an associated test to utilize the specified properties.

2016-01-06 18:16:37 -05:00

nifi-site-to-site

NIFI-259: Initial implementation of State Management feature

2016-01-11 16:38:52 -05:00

nifi-user-actions

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00

nifi-web

NIFI-259: - Addressing issues that arose from a merge conflict.

2016-02-05 17:47:56 -05:00

pom.xml

NIFI-1312-RC1 prepare for next development iteration

2015-12-19 00:41:04 -05:00