GitHub user ymao1 opened a pull request: https://github.com/apache/nifi/pull/172
[A-2013] Updating bootstrap.conf to reflect latest. Added langauge detection models directory to the bootstrap.conf to reflect changes made to bootstrap template in puppet for WF-2013 You can merge this pull request into a Git repository by running: $ git pull https://github.com/Asymmetrik/nifi A-2013 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/nifi/pull/172.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 #172 ---- commit a64716a43e127d5b8c0518db91a6878a750a9b03 Author: Ryan Blace <rebl...@gmail.com> Date: 2015-04-30T18:24:06Z Merge pull request #1 from apache/develop Merging latest NiFi to fork commit 7fbf2bbe352f3fb7f390daaea7a44885976ed720 Author: rstjohn <rstjoh...@gmail.com> Date: 2015-04-30T18:41:48Z [WF-447] Changed JSON provider to Jackson (fasterxml) commit c4f0271c4a72ed1bd210cf6894fb3576583f65db Author: Ryan Blace <rebl...@gmail.com> Date: 2015-04-30T19:10:27Z Merge pull request #2 from Asymmetrik/WF-447 [WF-447] Changed JSON provider to Jackson (fasterxml) commit ce7dcac07b4643743c8831da0f78b3db6569ecc9 Author: reblace <rebl...@gmail.com> Date: 2015-04-30T19:18:18Z Hostname support expression language. commit b34c5128309ff4ed153730ceb4994d88f52be4b7 Author: reblace <rebl...@gmail.com> Date: 2015-04-30T19:40:48Z Port support expression language. commit 4bc28d705604dce0ccbed2fe2c6b4911170802b8 Author: reblace <rebl...@gmail.com> Date: 2015-04-30T19:46:50Z Private Key Path expression language support. commit 4d8ecafaa1a2791c4671456c05bab5e352b78c63 Author: reblace <rebl...@gmail.com> Date: 2015-05-01T16:19:22Z Making LogLevel support expression language. commit 705ee9156d0fcbafc333eafe0a50f1e7964953c1 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-04T16:37:50Z Adding configurable batching support to PutKafka in order to enable higher throughput by leveraging the Kafka 0.8.1 producer properties commit aafa502c91fdbab55e994ff98411892c876b40b2 Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-04T19:26:53Z Added html encode/decode expression language methods. commit 9c69752a9bb3b6e577579a8d0fd323a2240b105f Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-04T19:27:28Z Merge pull request #3 from Asymmetrik/WF-429-Expressions Wf 429 expressions commit f777415e5c617a4316e8ce850792b880aff18647 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-04T20:30:12Z Adding new htmlEncode and htmlDecode methods to autocomplete and updating the docs to correctly describe functionality commit 91480ec7f72decab3d860f609b1c6a8465c8a271 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-04T20:32:54Z Merge pull request #5 from Asymmetrik/WF-470 Added html encode/decode expression language methods. commit a7f06b33d707c5201d6cb3e1eab254b37b58839c Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-05T00:37:26Z added html encode / decode unit tests commit bcb52323c03e490ac6733f28c4e30a7204b35afa Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-05T00:38:21Z Revert "added html encode / decode unit tests" This reverts commit a7f06b33d707c5201d6cb3e1eab254b37b58839c. commit 7905d249b995aa2fd4cff45a602159284af23bdb Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-05T00:39:14Z added html encode / decode unit tests commit 7d38e669d80bf12e55cdb85c788dd49400b1049c Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-05T00:54:30Z Changed Json provider to Jackson faster XML commit bd6c923e2a97f69bfa99d8daf99888866d737993 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T12:27:44Z Merge pull request #7 from Asymmetrik/WF-470b Wf 470b commit 6548348147c0fe162eb1cd02b0faef429024dc47 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T12:59:39Z Merge pull request #9 from apache/develop Merging latest Apache NiFi develop branch to our branch to sync up with ongoing development commit c4b4fcd5adbc1e4191abc66f9e2b9f399e55ed1d Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T13:31:32Z Merge branch 'develop' into WF-470c commit 80cd6674eaa092228112aef0d34ffcfc0c6ef76d Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T13:45:39Z Merge branch 'develop' into WF-470c commit 7e7868ffc016b7cad210aae9696fb44c76a4107c Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T13:46:25Z Merge pull request #8 from Asymmetrik/WF-470c Changed Json provider to Jackson faster XML commit 02b7ce199b5cbf6d35c5036969ceafc709f08cea Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T13:52:28Z Merge pull request #4 from Asymmetrik/WF-478-PutKafka-Batching Adding configurable batching support to PutKafka in order to enable high... commit 79e2d2d1443a0d30932c0273831fca8bd7bbe118 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T14:34:22Z Updating whitespace to respect Apache NiFi checkstyle commit d78a0712870f170eabcbd30ab540c960de321c2a Author: rstjohn <rstjoh...@gmail.com> Date: 2015-05-05T16:09:20Z removed duplicate dependencies in NiFi's parent pom.xml commit 3c08c41364a668326a82d86d0a9a5b08955454dc Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T20:31:24Z Merge pull request #10 from Asymmetrik/WF-447b removed duplicate dependencies in NiFi's parent pom.xml commit 96203e54febb7403365177b453ee1c565f8b369d Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-05T20:33:25Z Merge pull request #11 from apache/develop NIFI-429: Fixed typo in pom commit de412dca879deea99bc235c8c762b587adb5c06f Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-06T22:40:44Z [A-492] Moving compilation of JsonPath objects from properties to OnScheduled instead of OnTrigger. Saves time by reusing pre-compiled objects that are not dependent on FlowFile input commit c38ca4133699a3610d2d62e38dff44e130ba001c Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-07T21:49:49Z Merge pull request #12 from Asymmetrik/A-492-EvaluateJsonPath-PreCompile [A-492] Moving compilation of JsonPath objects from properties to OnS⦠commit 23c1f6661c6ece5698dcbbef9700efbc3c53f197 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-07T21:51:55Z Merge pull request #13 from apache/develop Merging latest Apache NiFi develop branch to our branch to sync up with ongoing development commit b5507da8a4b5053cc78672191bd27287fe8c52a8 Author: Brian Ghigiarelli <briang...@gmail.com> Date: 2015-05-14T15:58:31Z [A-427] Changing the Zookeeper Connection String to support expression language ---- --- 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. ---