Commit Graph

429 Commits

Author SHA1 Message Date
Joey Frazee 81aca7b97d NIFI-3302 Remove 'accepts incoming FlowFile' doc from QDT
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1406
2017-01-09 10:40:29 -05:00
Mike Moser 3259b01f8e NIFI-3230 fix ActiveMQ SSL support for simple connect URIs in Get/Put JMS processors
This closes #1344.
2017-01-05 22:19:25 +01:00
Pierre Villard 9b47961d1c
NIFI-3231 Added EL support to hostname and port in PutTCP/UDP
This closes #1361.

Signed-off-by: Bryan Bende <bbende@apache.org>
2017-01-03 12:09:19 -05:00
Bryan Rosander 1b4729e448
NIFI-3240 - AttributesToJson performance improvements
This closes #1352.

Signed-off-by: Bryan Bende <bbende@apache.org>
2017-01-03 10:20:16 -05:00
Davy De Waele 55f4716f3d NIFI-3266 Added EL support for basePath and port in ListenHTTP
This closes #1373.
2016-12-30 16:35:46 +01:00
Joe Gresock 2ea8b4122b NIFI-3127: Fixing NPE for empty flow files in SplitText
This closes #1358.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
2016-12-28 11:21:44 +09:00
Joe Gresock af8ed8b7de
NIFI-3253: Correcting documentation in Notify processor
This closes #1359.

Signed-off-by: Aldrin Piri <aldrin@apache.org>
2016-12-27 12:19:08 -05:00
Bryan Rosander 44c9ea0a66 NIFI-3236 - SplitJson performance improvements
This closes #1347.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
2016-12-22 15:22:53 +09:00
Bryan Rosander 4285157675
NIFI-3235 - EvaluateJsonPath performance improvements
This closes #1346.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-12-21 16:29:23 -05:00
Joe Gresock 34627f78b7
NIFI-190: Initial commit of Wait and Notify processors
This closes #1329.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-12-16 10:29:16 -05:00
Wesley-Lawrence 9a5986b0f6 NIFI-3175 Fix a bug in the ValidateCSV processor to handle empty CSV columns
This closes #1311.
2016-12-15 22:43:15 +01:00
Byunghwa Yun 0f462a7c49 NIFI-3029: QueryDatabaseTable supports max fragments property
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1213
2016-12-14 10:51:27 -05:00
Byunghwa Yun 2b6d6c25d8 NIFI-2866 The Initial Max Value of QueryDatabaseTable won't be case-sensitive
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1212
2016-12-05 12:50:43 -05:00
Mark Payne 8f8b8cdf46 NIFI-3071: Deprecated InputStreams & OutputStream sin org.apache.nifi.stream.io package in favor of using their Java counterparts 2016-12-05 09:29:19 -05:00
Koji Kawamura 8da38acf31 NIFI-3141: Fixed TailFile ArrayIndexOutOfBounds.
- Added unit test cases to simulate NiFi version update which fails without this fix.
- Added state object migration code, add file.0. prefix to state keys,
  and add length from stored position.

This closes #1289
2016-12-02 07:53:04 -05:00
Matt Burgess ba513447d7
NIFI-3076: Fixed handling of 'medium' unsigned integers in JdbcCommon
This closes #1254.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-11-30 13:05:38 -05:00
joewitt 92f17a995b NIFI-3100-rc2 prepare for next development iteration 2016-11-25 23:49:27 -05:00
joewitt 5536f690a8 NIFI-3100-rc2 prepare release nifi-1.1.0-RC2 2016-11-25 23:49:13 -05:00
Jeff Storck 066accc274 NIFI-3086 Updated TailFile.java to deal with windows paths that were breaking the regex parsing Fixed documentation misspelling in TailFile.java Fixed assertions in several tests in TestTailFile that were dependent on the received order of flowfiles, this was differing between Windows and MacOS/Linux
This closes #1264

Signed-off-by: jpercivall <JPercivall@apache.org>
2016-11-23 00:01:12 -05:00
Oleg Zhurakousky 913ae91614 Added posix guard to ignore tests on windows
This closes #1259

Signed-off-by: jpercivall <JPercivall@apache.org>
2016-11-22 17:11:25 -05:00
Kathik Narayanan 9e884f6120 NiFI-3064 Convert to Avro fails when a MySQL query returns two columns with the same name even with different aliases
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1251
2016-11-22 11:49:25 -05:00
joewitt fb9cbccc38 NIFI-2954 This closes #1244. Moved StandardPropertyValidator to nifi-utils, documented scope/purpose of a few util libs, removed deps from nifi-utils. 2016-11-21 16:30:42 -05:00
Matt Gilman 7f5eabd603
NIFI-3050: Implemented access control logic for restricted components.
- Addressing comments from PR.
- Adding restricted tags to relevant components.
- Showing a restricted icon overlay on the processor node on the canvas. (+1 squashed commit)
Squashed commits:
[f487682] NIFI-3050:
- Introducing a Restricted annotation for components that require elevated privileges to use.
- Updating the new Processor, Controller Service, and Reporting Task dialogs to include these details and prevent unauthorized selection.
- Including the Restricted description in the generated component documentation.
- Updating processor access control integration test to verify restricted component creation.
- Updating the developer, user, and admin guide to include the restricted component policy.

This closes #1247.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-11-21 12:07:48 -08:00
Peter Wicks d65f46f7a5 NIFI-2750
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2750

Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2750 Tweaking Property Retrieval

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1001
2016-11-21 12:58:17 -05:00
Mark Payne 2ee66de1a6 NIFI-3066: Create unit test to reproduce bug that results in IllegalArgumentException: Cannot migrate FlowFiles from a Process Session to itself
NIFI-3066: Ensure that when a Bin is created, it is always created with its own new session

This closes #1245
2016-11-21 11:34:14 -05:00
James Wing 7206318ecf NIFI-3033 GenerateFlowFile Dynamic Properties
This closes #1222.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
2016-11-18 11:06:20 +09:00
Bryan Rosander e5eda63705
NIFI-2943 - Toolkit uses JKS type over PKCS12 when creating truststore because non-Bouncy Castle providers cannot read certificates from PKCS12 truststore.
Peer review feedback (+2 squashed commits)
Squashed commits:
[0102c8e] NIFI-2943 - Peer review feedback
[9bcd495] NIFI-2943 - pkcs12 keystore improvements

1. loading pkcs12 keystores with bouncy castle everywhere
2. tls-toolkit client using jks truststore when keystore type is specified differently
3. tests

This closes #1165.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-11-16 17:13:10 -08:00
joewitt 45a5f5295c NIFI-2374 This closes #712. updated to latest tika versions where possible, updated doc, commented why cannot update media nar 2016-11-15 23:18:55 -05:00
Andre F de Miranda 3e571f9f1f NIFI-2374 - Adjust documentation wording to clarify IdentifyMimeType
is a non exhaustive list of mime type values
2016-11-15 22:42:21 -05:00
joewitt 6696529c99 Revert "NIFI-1893 Add processor for validating JSON"
This reverts commit f11682202b.

Signed-off-by: jpercivall <JPercivall@apache.org>
2016-11-15 18:09:14 -05:00
joewitt 1c9077334f NIFI-2991 removed usage of json lib and components still using it
Signed-off-by: jpercivall <JPercivall@apache.org>
2016-11-15 18:09:09 -05:00
Oleg Zhurakousky 41f519e84c NIFI-2851 initial commit of perf improvements on SplitText
- introduced org.apache.nifi.stream.io.util.TextLineDemarcator
- refactored SplitText to use org.apache.nifi.stream.io.util.TextLineDemarcator
- updated SplitText's capability discription to provide more clarity around splits with headers.
2016-11-11 15:45:40 -05:00
Byunghwa Yun 91f0170416 NIFI-3027: ExecuteProcess supports the expression language 2016-11-11 14:41:35 -05:00
Pierre Villard 06f191ca10
NIFI-2912 Allow custom text in GenerateFlowFile
This closes #1206.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-11-11 10:18:43 -08:00
Mark Payne c441a8696d NIFI-2850 This closes #1115. Added a migrate() method to ProcessSession and refactored BinFiles and MergeContent to use it 2016-11-09 16:25:03 -05:00
Jeff Storck cc2fbcaac4 NIFI-3008 Enabled expression language on BASE_DIRECTORY and FILENAME properties in TailFile
This closes #1190
2016-11-09 12:11:11 -05:00
patricker 4b4e099f2e NIFI-2764
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2764: Updated call to convertToAvroStream in TestJdbcCommon

This closes #1009
2016-11-08 14:45:49 -05:00
Matt Burgess 0841f14c18
NIFI-2928: Fixed checkstyle violation in FetchFile
This closes #1180

Signed-off-by: Bryan Rosander <brosander@apache.org>
2016-11-03 14:46:10 -04:00
Oleg Zhurakousky ed035f85e3 NIFI-2928 added support to validate accessibility of the file system
NIFI-2928 polishing

This closes #1160
2016-11-03 12:25:31 -04:00
patricker 2fb3b01ebe NIFI-2918 JDBC getColumnName may return empty string
This closes #1149
2016-11-02 13:13:34 -04:00
Matt Burgess 892c74dff2 NIFI-2819: Added support for Expresssion Language in ModifyBytes
This closes #1130
2016-11-02 13:02:25 -04:00
Koji Kawamura 9e90aae066 NIFI-2936: Fix TestExecuteProcess error on Travis.
This closes #1162.
2016-10-28 10:35:37 +02:00
Andre F de Miranda b864d49f66 NIFI-2341 - Introduce ParseCEF processor
This closes #785
2016-10-20 17:16:57 -04:00
Oleg Zhurakousky 611cadd231
NIFI-2919 Improved GetFile processor to fail (and provide bulletins) if target directory is inaccessible.
This closes #1147.

Signed-off-by: Andy LoPresto <alopresto@apache.org>

Fixed typos in error messages, renamed variables in test, and cleaned up unnecessary imports. (+1 squashed commit)
Squashed commits:
[e755cbd] NIFI-2919 improved GetFile to fail if target directory is inaccessible
2016-10-19 16:33:33 -04:00
Koji Kawamura 27dba60f27
NIFI-2905: Log error stream of ExecuteProcess cmd
ExecuteProcess ignores error stream when Redirect Error Stream is
false, this commit let it to be logged instead so that user can see it on
bulletin.

This closes #1143.

Signed-off-by: Andy LoPresto <alopresto@apache.org>
2016-10-18 15:56:27 -07:00
Oleg Zhurakousky 5afbc43364 NIFI-2500 This closes #1131. made container queue configurable 2016-10-18 14:47:49 -04:00
Oleg Zhurakousky c883f98cbf NIFI-2906 removed unused memebr variables
This closes #1144.
2016-10-17 22:32:23 +02:00
Matt Burgess 596b98865b NIFI-2894: Fixed typo in PutSQL documentation
This closes #1129
2016-10-14 12:45:34 -04:00
Pierre Villard 3c8545a902 NIFI-1912 - PutEmail fixed format when attachment
Correction as suggested by users in JIRA.
+ adding a unit test to check attachments.

This closes: #1081

Signed-off-by: Andre F de Miranda <trixpan@users.noreply.github.com>
2016-10-06 21:34:56 +11:00
Andre F de Miranda 3b408f5601 NIFI-2816 - Clean typos across the code - Part 2. This closes #1085 2016-10-05 13:07:57 -04:00
Byunghwa Yun 28acb07433 NIFI-2811 JdbcCommon doesn't convert bigint(20) column.
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1053
2016-09-27 10:18:48 -04:00
Byunghwa Yun 8868235993 NIFI-2803 The pagination of GenerateTableFetch has a sort bug.
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2803: Updated unit tests for GenerateTableFetch

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #1052
2016-09-26 12:05:16 -04:00
Andre F de Miranda 446cd44702 NIFI-2816 - Clean typos across the code
This closes #1057.
2016-09-26 17:47:31 +02:00
Pierre Villard 44d4b882bf NIFI-2071 - Support repeating capture groups in ExtractText
This closes #1050.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
2016-09-26 17:22:21 +09:00
Mike Moser 5a3d00c7bb NIFI-2636 resolve thread safety problem in UnpackContent
Signed-off-by: Joe Skora <jskora@apache.org>
2016-09-23 13:25:03 -04:00
Bartosz Wozniak f11682202b NIFI-1893 Add processor for validating JSON
This closes #1037.
2016-09-22 13:08:34 +02:00
Byunghwa Yun 77f8503e98 NIFI-2802 The implementation classes don't support orderByClause.
This closes #1044.
2016-09-22 12:21:43 +02:00
Nicolas Dupont be83c0c5b2 NIFI-1844 - Added ListFTP and FetchFTP processors
This closes #881.
2016-09-21 17:40:38 +02:00
Peter Wicks 938c7cccb8 NIFI-2749
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #997
2016-09-21 11:16:57 -04:00
Pierre Villard 930e95aa00 NIFI-1170 - Improved TailFile processor to support multiple files tailing
This closes #980
2016-09-21 10:05:39 -04:00
Matt Burgess 68291636cb
NIFI-1841: Fixed support for CLOB/BLOB types
This closes #1035.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-09-20 15:33:06 -04:00
Pierre Villard d838f61291 NIFI-1942 Processor to validate CSV against user-supplied schema
This closes #476

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-09-16 11:13:07 -04:00
Andy LoPresto 022f5a506d NIFI-2266 Refactored GetHTTP processor to use SSLContext protocol vs. hard-coded TLSv1.
This closes #999.
2016-09-16 00:08:08 +02:00
Pierre Villard c1ad913598 NIFI-1342 Added default User-Agent in PostHttp
This closes #1021
2016-09-15 09:57:09 -04:00
Joe Skora c72a9aa54b NIFI-2752 Correct ReplaceText default pattern and unit tests
* Corrected the DEFAULT_REGEX pattern.
 * Added tests to isolate regex capture group problem and verify corrected functionality.
 * Removed short circuit logic that masked configuration errors and created inconsistent processor behavior.

This closes #1007.
2016-09-13 22:55:55 +02:00
Matt Burgess d325773760 NIFI-2262: Added Avro-normalization of table/column names in SQL processors
This closes #994.
2016-09-13 15:46:33 +02:00
Kirk Tarou e25885650a NIFI-2440 - Add 'file.lastModifiedTime' attribute to ListSFTP processor
Added 'file.lastModifiedTime' attribute to ListFileTransfer, which is
the abstract class extended by ListSFTP.
String literal attribute names were replaced with static references to
attribute name constants in ListFile.
ListFileTransfer stores the 'file.lastModifiedTime' attribute in the
format specified in ListFile.FILE_MODIFY_DATE_ATTR_FORMAT

Updated WritesAttribute description for file last modify time attribute
to mirror the entry in ListFile

Signed-off-by: Joe Skora <jskora@gmail.com>

This closes #931.
2016-09-09 22:44:23 -04:00
Matt Burgess 2afc739ab7 NIFI-2712: Fixed Fetch processors for multiple max-value columns. This closes #976 2016-09-06 16:52:40 -04:00
Andy LoPresto 8556777bf6
NIFI-2618 Reverted merging PR 955 to master as 1.0.0 requires Java 8. 2016-08-30 09:27:24 -07:00
Andy LoPresto d600b065bb
NIFI-2618 Added logic to unit test to handle default TLS version for Java <= 7.
This closes #955.
2016-08-30 08:25:38 -07:00
Joseph Percivall 1fe18a1567 NIFI-2676-rc1 prepare for next development iteration 2016-08-26 11:40:58 -04:00
Joseph Percivall 74d5224783 NIFI-2676-rc1 prepare release nifi-1.0.0-RC1 2016-08-26 11:40:44 -04:00
Bryan Rosander 102a9a2b74 NIFI-2674 - Always adding flow files to result set flowfiles, catching runtime exceptions while converting to avro
Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #953
2016-08-25 21:16:26 -04:00
Matt Burgess ad7808f63d NIFI-2641: This closes #928. Add max values as attributes to QueryDatabaseTable 2016-08-25 14:13:55 -04:00
Peter Wicks e210172d93 PutSQLBinary
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2591

Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2591

Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2591 - Added Format option for binary data types. Updated unit tests.

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #883
2016-08-25 08:41:23 -04:00
Matt Burgess ee9bd94082 NIFI-2632: Added fragment attributes to SplitJson and SplitXml
Signed-off-by: Yolanda M. Davis <ymdavis@apache.org>

This closes #919
2016-08-23 16:30:57 -04:00
Jeff Storck dca3764ed1 NIFI-2626 Fixes jetty server thread leak. This closes #910 2016-08-22 15:58:06 -04:00
Joe Gresock 17dec04939 NIFI-2611: Fixing bugs in UnpackContent with flow file unpackers
Signed-off-by: Mike Moser <mosermw@apache.org>

This closes #905
2016-08-22 14:47:24 -04:00
Joe Skora a2d3d0c289 Update to support offsets larger than 2 gigabyte. 2016-08-22 11:02:48 -04:00
Joe Skora 02071103d0 * Add "Remove All Content" property, related functionality, and tests to ModifyBytes processor to allow deletion of all flow file content.
* Removed @Ignore annotation on class and unnecessary EOL translation of test data.  Because ModifyBytes treat input as binary data, not text, line endings don't matter as long as they byte offsets are calculated correctly.
* Replace validator with .allowableValues.

This closes #890.
2016-08-19 20:05:14 +02:00
Mark Payne 567535c3d0 NIFI-2382: Fixed typo in documentation 2016-08-18 09:15:55 -04:00
Mark Payne 91a59a8a5a NIFI-2545: Ensure that when @OnUnscheduled and @OnStopped methods are called that the active thread count takes that thread into account
This closes #836.
2016-08-18 08:33:45 -04:00
Peter Wicks 7bc7b7f683
NIFI-2584 Fixing date format in PutSQL
This closes #878.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-08-17 16:10:56 -04:00
Peter Wicks a0d1aae603 NIFI-2583
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2582

Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2582

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #877
2016-08-17 13:20:44 -04:00
Peter Wicks 1470a52b1b NIFI-2582 NIFI-2583
Signed-off-by: Matt Burgess <mattyb149@apache.org>

NIFI-2583 Tweaks

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #877
2016-08-17 13:19:56 -04:00
Peter Wicks b22500d0a3
NIFI-2576 Allowing PutSQL to use timestamps in epoch or string format
This closes #869.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-08-16 10:26:24 -04:00
Mark Payne 6af768d0a1 NIFI-2551: Addressed a threading issue in the StandardResourceClaimManager and performed some refactoring so that we can ensure thread-safety across different components of the application, such as ProcessSession and WriteAheadFlowFile Repository when interacting with the StandardResourceClaimManager. Update DebugFlow to allow it to write to a FlowFile multiple times, which exposes the concurrency bug. Also avoided calling ContentRepository.remove() from ProcessSession whenever the content is no longer needed, as that can cause problems now that the Resource Claim is backing the content claim. 2016-08-15 17:02:15 -04:00
Peter Wicks 44057f097a
NIFI-2356 ConvertJSONToSQL assumes IS_AUTOINCREMENT
This closes #862.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-08-15 14:17:16 -04:00
Matt Burgess d544274881
NIFI-2531: Fixed JdbcCommon handling of BigInteger objects for Avro
This closes #823.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-08-10 15:19:34 -04:00
Joey Frazee bb24312709 NIFI-2142 Added Guava cache for XSLT stylesheets in TransformXml
This closes #609

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-08-10 11:13:30 -04:00
Matt Burgess 557d6365bf NIFI-2518: Added unit test showing issue
NIFI-2518: Added support for fractional seconds to AbstractDatabaseFetchProcessor

This closes #821
2016-08-10 11:10:17 -04:00
Kirk Tarou e2f649cfea NIFI-2470 This closes #802.
Fixed WritesAttributes section to include all attributes with the
correct attribute names and descriptions
2016-08-07 23:58:09 -04:00
joewitt 6bcc415eb8 NIFI-2457 removed old state file mechanism and fixed state reset logic
This closes #768.

Signed-off-by: Bryan Bende <bbende@apache.org>
2016-08-02 12:11:43 -04:00
joewitt 05a99a93cb NIFI-2208 This closes #754. refactored as per comments on JIRA. Reduced API expsosure and tightened lifecycle management. 2016-08-01 14:17:26 -04:00
Yolanda M. Davis 8412d2662a NIFI-2208 - initial commit Custom Property Expression Language support with Variable Registry, includes bug fix for NIFI-2057
This closes #529

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-07-29 17:10:20 -04:00
Yolanda M. Davis 35c0e1436e NIFI-2310 - upgraded jolt to 0.0.21 to resolve special character issue
This closes #674

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
2016-07-21 10:35:42 +09:00
Matt Burgess f1ba240326 NIFI-2156: Add ListDatabaseTables processor
This closes #642

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-07-19 13:00:43 -04:00
Matt Burgess 01cae23745 NIFI-2157: Add GenerateTableFetch processor
This closes #645

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-07-17 17:54:42 -04:00
Koji Kawamura e89ee11199 NIFI-619: Make MonitorActivity more cluster friendly
With this commit, MonitorActivity can be configured as:

- Monitor activity per node individually
- Monitor cluster wide activity
  - Send notification flow-file from all of nodes
  - or only from a primary node

Changes:
- Added 'Monitoring Scope' property
- Added 'Reporting Node' property
- Falls back from cluster scope to node scope if necessary
- Persist the latest activity as Cluster state
- Examine cluster state on each node if necessary
- Only update the cluster state if current timestamp is later than existing
  timestamp stored in Zookeeper

This closes #575

Signed-off-by: jpercivall <joepercivall@yahoo.com>
2016-07-15 12:47:37 -04:00
Yolanda M. Davis 048ba5366c NIFI-2020 - initial commit for custom transformation support
NIFI-2020 - updates to use lambdas/stream wherever possible and fix potential nullpointer issue.

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #564
2016-07-14 18:04:14 -04:00