GitHub user markap14 opened a pull request:

    https://github.com/apache/nifi/pull/649

    Nifi 1413

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/markap14/nifi NIFI-1413

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/nifi/pull/649.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #649
    
----
commit ef1aeb7f5e232dc54d40b2b4ad7300d5092c1596
Author: Mark Payne <[email protected]>
Date:   2016-06-30T14:48:46Z

    NIFI-1413: Ensure that if a node's templates don't match the clusters that 
we take the following actions: -Local templates remain but aren't shown in the 
cluster's templates. -Any templates from the cluster that don't exist on the 
node are added to the node. -Any conflicting template definitions are replaced 
by those in the cluster
    
    This closes #596

commit 83f9b7a036ce7875995bfd339f02a9c189220f59
Author: Mark Payne <[email protected]>
Date:   2016-07-14T14:06:46Z

    NIFI-1413: Rebased against master and updated templates endpoint merge to 
use template entities instead of template dto's

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to