Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream apache/nifi #1

Merged
merged 11 commits into from
Sep 5, 2019
Merged

Conversation

VinceCastro
Copy link
Owner

@VinceCastro VinceCastro commented Sep 5, 2019

For instructions on how to sync your fork with the corresponding upstream directly from github look here:

https://stackoverflow.com/questions/20984802/how-can-i-keep-my-fork-in-sync-without-adding-a-separate-remote/21131381#21131381

anyway this method add a commit on top of original ones so it is actually preferable to use the following method:

1 - go to the upstream repo on github and try to edit the readme or another file and confirm: do not worry, this will create a branch named patch-1 in your fork repo
2 - make patch-1 as default branch
3 - delete the master branch in your fork repo on github
4 - explore patch-1 commits, go to the HEAD~1 commit and create a new branch from there named master
5 - make the new master you just created as the default one
6 - delete the branch patch-1

the source for this last method is: isaacs/github#121 (comment)

bbende and others added 11 commits September 3, 2019 11:32
…nt process group

This closes #3686.

Signed-off-by: Mark Payne <[email protected]>
- Conditionally support parameters in controller service configuration.

This closes #3688

Signed-off-by: Scott Aslan <[email protected]>
… that we populate the AffectedComponentEntities with the most up-to-date version of the component

This closes #3689
…ons when configuring a PG. Also, sort the list of PCs for the combo dropdown in the PG configuration

This closes #3690
…n locally modified (when they hadn't been) when running against versions of the registry older than 0.5.0

This closes #3687.

Signed-off-by: Bryan Bende <[email protected]>
Additional test case in TestEncryptContent
Apply suggestions from code review
nit picking
Apply suggestions from code review
nitpicking from mgaido91
Small fixes
Additional test case to check the provided cipher is actually used by inferring it from the ciphertext
Updated `EncryptContent` to use a pre-defined list of allowable PGP ciphers
Updated `EncryptContent` to check the validity of `PGP_SYMMETRIC_ENCRYPTION_CIPHER`
Updated test cases
Minor fixes
NIFI-6536 Fixed typo and strengthened validity checking for PGP symmetric cipher.

This closes #3664.

Co-Authored-By: Marco Gaido <[email protected]>

Signed-off-by: Andy LoPresto <[email protected]>
- Renamed PARTITION_VALUES to STATIC_PARTITION_VALUES for correctness and better understanding
- STATIC_PARTITION_VALUES descriptions clearly states that having that property filler implies Hive Static Partitioning

NIFI-6536: Additional documentation for Static Partition Values

Signed-off-by: Matthew Burgess <[email protected]>

This closes #3631
NIFI-5755 Allow PutParquet processor to specify avro write configuration
Review feedback
Additional review feedback

This closes #3679

Signed-off-by: Mike Thomsen <[email protected]>
@VinceCastro VinceCastro merged commit 3639585 into VinceCastro:master Sep 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
7 participants