Commit Graph

1500 Commits

Author SHA1 Message Date
Aldrin Piri 72fd05610f Merge branch 'NIFI-525' into develop 2015-04-23 14:33:02 -04:00
Matt Gilman 61b1d128e1 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-23 14:01:58 -04:00
Mark Latimer 2393a6fc53 Increase inactive rather than active counter where port is not running.
Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
2015-04-23 14:00:23 -04:00
Aldrin Piri 503c773f45 Merge branch 'NIFI-437' into develop 2015-04-23 13:57:46 -04:00
Aldrin Piri 0ecc6414df Providing a JUnit assume for the TestServerAndClient#testClientTermination test which currently fails on OS X with JDK 1.8 due to a JVM bug. 2015-04-23 13:16:17 -04:00
Matt Gilman ff831dc33d NIFI-524:
- Adding a Process Group tab to the summary table to show aggregate statistics of their comonents.
2015-04-23 12:59:41 -04:00
Matt Gilman 8bfc969142 NIFI-534:
- Dumping the stack when debug is enabled.
2015-04-23 11:28:11 -04:00
Matt Gilman 7678dd907b NIFI-271:
- If a module has custom rat plugin configuration it overrides the global configuration. Need to copy over any required items.
2015-04-23 10:17:24 -04:00
Matt Gilman f5479428e5 NIFI-534:
- Getting component metrics from Nodes on a set interval using their most recent heartbeat in order to ensure there is a data point for each node for each window.
- Updating the snapshot reduce method to use the timestamp from the first snapshot. This is then the timestamp for the aggregate snapshot.
2015-04-23 10:13:05 -04:00
Aldrin Piri ce5ebd9cee Upgrading to JsonPath 2.0.0 2015-04-23 10:07:05 -04:00
joewitt a53cc3d707 NIFI-271 more cleanup 2015-04-22 23:42:19 -04:00
Aldrin Piri 7f9dff52b0 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-22 17:12:23 -04:00
Aldrin Piri 1367b39b5b Merge remote-tracking branch 'origin/NIFI-271' into develop 2015-04-22 16:59:56 -04:00
Aldrin Piri 06b2c080a5 Removing the remnant reference of the nifi-nar-maven-plugin from nifi-parent. 2015-04-22 16:49:28 -04:00
joewitt 060a1e0d9c NIFI-537 fixed identified licensing issue with several of the new nars 2015-04-22 14:50:03 -04:00
joewitt 0d7838273c NIFI-537 fixed identified licensing issue with nifi-standard-content-viewer 2015-04-22 13:51:36 -04:00
joewitt 6d512f1e01 NIFI-537 fixed identified licensing issue with nifi-web-content-viewer 2015-04-22 13:43:44 -04:00
joewitt 9dda16c995 NIFI-271 checkpoint 2015-04-22 12:52:00 -04:00
Mark Payne 6fa596884b NIFI-535: Fixed NPE in SnippetUtils 2015-04-22 12:18:41 -04:00
joewitt 888254b2a1 NIFI-271 checkpoint 2015-04-22 11:46:26 -04:00
Brian Ghigiarelli 29b4e56a61 Merge pull request #1 from apache/develop
Merging latest NiFi to my fork
2015-04-22 11:32:36 -04:00
joewitt b612b6bcd9 NIFI-271 checkpoint 2015-04-21 23:39:31 -04:00
joewitt afb4fe52b9 NIFI-271 checkpoint 2015-04-21 15:24:04 -04:00
joewitt 6d728406de Merge branch 'develop' into NIFI-271 2015-04-21 14:03:22 -04:00
joewitt bcb3ca8f98 NIFI-271 got through nifi-api 2015-04-21 12:21:16 -04:00
Matt Gilman c026dff40c NIFI-511:
- Requiring an open parenthesis to consider the token a function.
2015-04-21 08:01:11 -04:00
joewitt fe8e30a034 NIFI-271 removed a checkstyle file that was mistakenly added 2015-04-21 02:18:34 -04:00
joewitt 9faaef8cfa NIFI-271 checkpoint push because there are so many changes. Long way to go but got through dto library 2015-04-21 02:15:46 -04:00
Mike Moser a4285e9464 additional details in doc 2015-04-20 21:35:35 -04:00
Mike Moser 156d9409ff NIFI-30 NIFI-374 EncryptContent support of PGP 2015-04-20 21:26:24 -04:00
bbende 8374d12e5e Adding unit test for deleting documents by query through an xml command 2015-04-20 20:13:13 -04:00
bbende 2d61073beb Cleaning up TestGetSolr 2015-04-20 19:04:08 -04:00
bbende 0594a43312 Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle 2015-04-20 18:40:05 -04:00
Jenn Barnabee bef65db72c Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-20 04:36:30 -04:00
joewitt 8a296aacc9 NIFI-271 Merged with latest develop. Rebase seemed to dangerous in this case. Does not build yet. 2015-04-19 23:12:22 -04:00
Jenn Barnabee 574e57a4fb NIFI-520 added explanation of enabling and disabling controller services. Also fixed images in that section and added some explanation about file expiration in the Connecting Components section. 2015-04-19 16:01:19 -04:00
Aldrin Piri 53b6ac3333 NIFI-485: Allow user to choose how to handle missing JsonPath by ignoring or with a warning 2015-04-19 09:24:45 -04:00
Jenn Barnabee 13cd2a67c8 Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-18 07:05:29 -04:00
Aldrin Piri fb2206a9bb nifi-476: Addressing the handling of null values in JsonPath related processors and providing configuration to treat them as empty string or the string "null".
Signed-off-by: Aldrin Piri <aldrinpiri@gmail.com>
2015-04-17 23:30:26 -04:00
bbende d09d58ddf2 Improving error handling to detect when a SolrServerException is caused by an IOException 2015-04-17 18:25:23 -04:00
bbende e9402a0ddc Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle 2015-04-17 18:06:14 -04:00
Mark Payne c5b961be5b Merge branch 'persistent-prov-fixes' into develop 2015-04-17 12:09:07 -04:00
Mark Payne 3667a28e87 Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-17 12:06:52 -04:00
Mark Payne a06c25373f NIFI-523: Do not read all lucene documents when we dont need to 2015-04-17 09:13:57 -04:00
joewitt ce5a654e96 NIFI-522 updated Jetty version and removed extraneous name element from unrelated pom 2015-04-17 07:59:54 -04:00
bbende a9ef5ec1bc Upgrading to Solr 5.1.0, fixing empty javadoc, and cleaning up variable naming 2015-04-16 22:09:11 -04:00
Jenn Barnabee 7843132228 NIFI-520 Added documentation on the new Controller Services and Reporting Tasks features to the User Guide. 2015-04-15 07:45:29 -04:00
bbende 751d601a92 Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Conflicts:
	nifi/nifi-assembly/pom.xml
	nifi/nifi-nar-bundles/pom.xml
2015-04-13 20:03:30 -04:00
Matt Gilman 8270791b1d Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop 2015-04-11 20:47:38 -04:00
Mark Payne 8bcaca7514 NIFI-506: Fixed unit tests 2015-04-11 20:01:22 -04:00