[GitHub] nifi-minifi pull request #72: MINIFI-216 - Allowing override of nifi.propert...

2017-02-21 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/nifi-minifi/pull/72


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] nifi-minifi pull request #72: MINIFI-216 - Allowing override of nifi.propert...

2017-02-21 Thread brosander
Github user brosander commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/72#discussion_r102292357
  
--- Diff: 
minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 ---
@@ -704,7 +691,7 @@ protected static void addTextElement(final Element 
element, final String name, f
 }
 
 public static final String PROPERTIES_FILE_APACHE_2_0_LICENSE =
-"# Licensed to the Apache Software Foundation (ASF) under one 
or more\n" +
+" Licensed to the Apache Software Foundation (ASF) under one 
or more\n" +
--- End diff --

@phrocker due to the change in the way the props file is written out.

[The store 
method](https://github.com/apache/nifi-minifi/pull/72/files#diff-a022622bcf128ab992d247f2a8694a0eR263)
 will prepend a # to the comment string.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] nifi-minifi pull request #72: MINIFI-216 - Allowing override of nifi.propert...

2017-02-21 Thread phrocker
Github user phrocker commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/72#discussion_r102290405
  
--- Diff: 
minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
 ---
@@ -704,7 +691,7 @@ protected static void addTextElement(final Element 
element, final String name, f
 }
 
 public static final String PROPERTIES_FILE_APACHE_2_0_LICENSE =
-"# Licensed to the Apache Software Foundation (ASF) under one 
or more\n" +
+" Licensed to the Apache Software Foundation (ASF) under one 
or more\n" +
--- End diff --

Why did you remove the comment markdown (octothorp -- #)?


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] nifi-minifi pull request #72: MINIFI-216 - Allowing override of nifi.propert...

2017-02-21 Thread phrocker
Github user phrocker commented on a diff in the pull request:

https://github.com/apache/nifi-minifi/pull/72#discussion_r102289560
  
--- Diff: minifi-bootstrap/src/test/resources/MINIFI-216/config.yml ---
@@ -0,0 +1,106 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
--- End diff --

+1 I think we should be able to share these test resources amongst cpp and 
java and have the same results or at least used in similar tests. 


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] nifi-minifi pull request #72: MINIFI-216 - Allowing override of nifi.propert...

2017-02-21 Thread brosander
GitHub user brosander opened a pull request:

https://github.com/apache/nifi-minifi/pull/72

MINIFI-216 - Allowing override of nifi.properties values

Thank you for submitting a contribution to Apache NiFi - MiNiFi.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

### For all changes:
- [X] Is there a JIRA ticket associated with this PR? Is it referenced 
 in the commit message?

- [X] Does your PR title start with MINIFI- where  is the JIRA 
number you are trying to resolve? Pay particular attention to the hyphen "-" 
character.

- [X] Has your PR been rebased against the latest commit within the target 
branch (typically master)?

- [X] Is your initial contribution a single, squashed commit?

### For code changes:
- [X] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi-minifi folder?
- [X] Have you written or updated unit tests to verify your changes?
- [X] - N/A - If adding new dependencies to the code, are these 
dependencies licensed in a way that is compatible for inclusion under [ASF 
2.0](http://www.apache.org/legal/resolved.html#category-a)? 
- [X] - N/A - If applicable, have you updated the LICENSE file, including 
the main LICENSE file under minifi-assembly?
- [X] - N/A - If applicable, have you updated the NOTICE file, including 
the main NOTICE file found under minifi-assembly?

### For documentation related changes:
- [X] Have you ensured that format looks appropriate for the output in 
which it is rendered?

### Note:
Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.


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

$ git pull https://github.com/brosander/nifi-minifi MINIFI-216

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

https://github.com/apache/nifi-minifi/pull/72.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 #72


commit 397d52f99ae3e7ef0b252336c11e164bfd66ec71
Author: Bryan Rosander 
Date:   2017-02-21T16:15:09Z

MINIFI-216 - Allowing override of nifi.properties values




---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---