Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,856 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

2583 Commits

Author SHA1 Message Date
Karthik Kambatla 92de44c2c5 Set the release date for 2.5.2 
(cherry picked from commit 68a0508728)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-10 15:23:43 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Arun C. Murthy cff08dab5e Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 
(cherry picked from commit 770cc14442)
 2014-11-09 18:48:01 -08:00
Arun C. Murthy 1fc98b5c9a Revert "HDFS-7383. Merged to branch-2.6 also." 
This reverts commit 755af2768b.
 2014-11-09 18:25:05 -08:00
Arun C. Murthy 755af2768b HDFS-7383. Merged to branch-2.6 also. 
(cherry picked from commit f62ec31739)
 2014-11-09 18:22:58 -08:00
Suresh Srinivas d8e699be73 HDFS-7383. Moved the jira from release 2.7.0 section to 2.6.0 in CHANGES.txt 2014-11-09 18:22:18 -08:00
Suresh Srinivas d4f2e791a5 HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw NullPointerException. Contributed by Tsz Wo Nicholas Sze. 2014-11-09 17:55:49 -08:00
Arun C. Murthy 1f5bad04ce HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs. 
(cherry picked from commit 6caa8100d5)
 2014-11-09 05:23:10 -08:00
cnauroth 98b81c6624 HDFS-7382. DataNode in secure mode may throw NullPointerException if client connects before DataNode registers itself with NameNode. Contributed by Chris Nauroth. 
(cherry picked from commit 9ba8d8c7eb)
 2014-11-08 22:29:15 -08:00
Haohui Mai 52d5425aad HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao. 2014-11-07 13:39:23 -08:00
cnauroth c7752f9180 HDFS-7226. Update CHANGES.txt to indicate fix in 2.6.0. 
(cherry picked from commit d026f36762)
 2014-11-06 23:10:48 -08:00
cnauroth 58e8b280c7 HDFS-7221. Update CHANGES.txt to indicate fix in 2.6.0. 
(cherry picked from commit e7f1c0482e)
 2014-11-06 22:47:24 -08:00
Jing Zhao 10fe37522c HDFS-7364. Balancer always shows zero Bytes Already Moved. Contributed by Tsz Wo Nicholas Sze. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
 2014-11-06 17:55:49 -08:00
Haohui Mai d0101f1ce3 HDFS-7365. Remove hdfs.server.blockmanagement.MutableBlockCollection. Contributed by Li Lu. 2014-11-06 13:53:51 -08:00
Milan Desai 5c8b55856b HDFS-7336. Unused member DFSInputStream.buffersize. Contributed by Milan Desai. 2014-11-05 20:52:36 -08:00
Byron Wong 693939782b HDFS-7329. Improve logging when MiniDFSCluster fails to start. Contributed by Byron Wong. 2014-11-05 20:52:34 -08:00
Haohui Mai ee44d8fb3f HDFS-7367. HDFS short-circuit read cannot negotiate shared memory slot and file descriptors when SASL is enabled on DataTransferProtocol. Contributed by Chris Nauroth. 2014-11-05 20:34:11 -08:00
Konstantin V Shvachko 74d40b3d9e HDFS-7361. TestCheckpoint fails after change of log message related to locking violation. Contributed by Konstantin Shvachko. 2014-11-05 20:23:13 -08:00
Haohui Mai 0f9d0d9d8f HDFS-7366. BlockInfo should take replication as an short in the constructor. Contributed by Li Lu. 2014-11-05 18:13:55 -08:00
cnauroth f172a08238 HDFS-7359. NameNode in secured HA cluster fails to start if dfs.namenode.secondary.http-address cannot be interpreted as a network address. Contributed by Chris Nauroth. 
(cherry picked from commit ba1d4ad25b)
 2014-11-05 15:27:27 -08:00
Colin Patrick Mccabe af3694b392 CHANGES.txt. Move HDFS-7199 to branch-2.6 2014-11-05 10:55:36 -08:00
Colin Patrick Mccabe 6f7ce842c0 HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer crashes with an unchecked exception (rushabhs via cmccabe) 
(cherry picked from commit 56257fab1d)
 2014-11-05 10:52:19 -08:00
Konstantin V Shvachko 1ef616ceb7 HDFS-7333. Improve logging in Storage.tryLock(). Contributed by Konstantin Shvachko. 2014-11-05 09:50:48 -08:00
Konstantin V Shvachko 1436e89fb7 HDFS-7335. Redundant checkOperation() in FSN.analyzeFileState(). Contributed by Milan Desai. 2014-11-05 09:39:02 -08:00
yliu 46c29b988d HDFS-7218. FSNamesystem ACL operations should write to audit log on failure. (clamb via yliu) 2014-11-05 15:53:08 +08:00
Haohui Mai b96fefc032 HDFS-7357. FSNamesystem.checkFileProgress should log file path. Contributed by Tsz Wo Nicholas Sze. 2014-11-04 18:11:45 -08:00
Haohui Mai fa92b40f09 HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:53:00 -08:00
Karthik Kambatla 6f9484221e Adding release 2.5.2 to CHANGES.txt 
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 16:51:54 -08:00
Karthik Kambatla 395d4ba766 HADOOP-11260. Patch up Jetty to disable SSLv3. (Mike Yoder via kasha) 
(cherry picked from commit dbf30e3c0e)
 2014-11-04 16:22:09 -08:00
Jing Zhao 9d697e3038 HDFS-7233. NN logs unnecessary org.apache.hadoop.hdfs.protocol.UnresolvedPathException. Contributed by Rushabh S Shah. 2014-11-04 16:05:04 -08:00
Haohui Mai 4ca67c09fc HDFS-7355. TestDataNodeVolumeFailure#testUnderReplicationAfterVolFailure fails on Windows, because we cannot deny access to the file owner. Contributed by Chris Nauroth. 2014-11-04 15:19:06 -08:00
Jing Zhao dbe4b20d23 HDFS-7356. Use DirectoryListing.hasMore() directly in nfs. Contributed by Li Lu. 2014-11-04 15:05:55 -08:00
Haohui Mai 7e2bdd5255 HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of going remote. Contributed by Dapeng Sun. 2014-11-04 15:02:25 -08:00
Haohui Mai aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Haohui Mai e5e3f86c64 HDFS-7334. Fix periodic failures of TestCheckpoint#testTooManyEditReplayFailures. Contributed by Charles Lamb. 2014-11-04 14:35:10 -08:00
Jing Zhao b1fd0b6678 HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao. 2014-11-04 10:17:11 -08:00
cnauroth 5720cc9d2d HDFS-7328. TestTraceAdmin assumes Unix line endings. Contributed by Chris Nauroth. 
(cherry picked from commit 2bb327eb93)
 2014-11-03 20:04:25 -08:00
Haohui Mai d2d2c84a10 HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-11-03 15:10:37 -08:00
Suresh Srinivas c1ba223009 HDFS-7324. haadmin command usage prints incorrect command name. Contributed by Brahma Reddy Battula. 2014-11-03 13:33:33 -08:00
Kihwal Lee c8648bd27e HADOOP-10987. Provide an iterator-based listing API for FileSystem. Contributed by Kihwal Lee. 2014-11-03 08:23:34 -06:00
Tsz-Wo Nicholas Sze bac064de62 HDFS-7276. Limit the number of byte arrays used by DFSOutputStream and provide a mechanism for recycling arrays. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-11-01 11:33:22 -07:00
Colin Patrick Mccabe 60acff3e60 HDFS-6917. Add an hdfs debug command to validate blocks, call recoverlease, etc. (cmccabe) 
(cherry picked from commit 7b026c50f1)
 2014-10-31 13:35:00 -07:00
Haohui Mai 31612ed64d HDFS-7315. DFSTestUtil.readFileBuffer opens extra FSDataInputStream. Contributed by Plamen Jeliazkov. 2014-10-31 11:50:57 -07:00
Ravi Prakash fe8cf32493 HDFS-7309. XMLUtils.mangleXmlString doesn't seem to handle less than sign. (Colin Patrick McCabe via raviprak) 
(cherry picked from commit c7f81dad30)
 2014-10-31 11:24:00 -07:00
cnauroth 57fa43ab0a HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth. 
(cherry picked from commit 5573b3476a)
 2014-10-30 22:52:33 -07:00
cnauroth caded2545c HDFS-6385. Show when block deletion will start after NameNode startup in WebUI. Contributed by Chris Nauroth. 
(cherry picked from commit c637d6d9d5)
 2014-10-30 22:29:20 -07:00
Colin Patrick Mccabe ec2621e907 HDFS-7035. Make adding a new data directory to the DataNode an atomic operation and improve error handling (Lei Xu via Colin P. McCabe) 
(cherry picked from commit a9331fe9b0)
 2014-10-30 17:32:23 -07:00
Andrew Wang ec19c85e65 HDFS-3342. SocketTimeoutException in BlockSender.sendChunks could have a better error message. Contributed by Yongjun Zhang. 
(cherry picked from commit 16c0f04c50822a39610e34e0715d3d4a44be5a5f)
 2014-10-30 11:03:30 -07:00
Jing Zhao fe1f4c64d1 HDFS-7230. Add rolling downgrade documentation. Contributed by Tsz Wo Nicholas Sze. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-30 10:48:36 -07:00
Andrew Wang ca6a21f7d1 HDFS-7165. Separate block metrics for files with replication count 1. Contributed by Zhe Zhang. 2014-10-30 10:21:12 -07:00
Tao Luo 8bfef59029 HDFS-7263. Snapshot read can reveal future bytes for appended files. Contributed by Tao Luo. 2014-10-29 20:20:11 -07:00
Haohui Mai c7d1db7495 HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li. 2014-10-29 17:54:37 -07:00
Jing Zhao d25f8a12c6 HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao. 2014-10-29 16:26:20 -07:00
Kihwal Lee 79c57e5913 HDFS-7300. HDFS-7300. The getMaxNodesPerRack() method in 
BlockPlacementPolicyDefault is flawed. contributed by Kihwal Lee
(cherry picked from commit 3ae84e1ba8)
 2014-10-29 17:25:05 -05:00
Jason Lowe 0c15130db2 HADOOP-9740. Fix FsShell '-text' command to be able to read Avro files stored in HDFS and other filesystems. Contributed by Allan Yan 2014-10-29 20:23:17 +00:00
Colin Patrick Mccabe 112d694086 HDFS-7287. The OfflineImageViewer (OIV) can output invalid XML depending on the filename (Ravi Prakash via Colin P. McCabe) 
(cherry picked from commit d33e07dc49)
 2014-10-29 12:39:00 -07:00
Brandon Li 6caf36f9eb HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang 
(cherry picked from commit 72a556d3b0)
 2014-10-29 11:06:44 -07:00
Karthik Kambatla f2679ae22e HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha) 
(cherry picked from commit 3f48493bed)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-28 17:33:52 -07:00
Haohui Mai bbdd990864 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:54:04 -07:00
Colin Patrick Mccabe 842a54a5f6 HDFS-7235. DataNode#transferBlock should report blocks that don't exist using reportBadBlock (yzhang via cmccabe) 
(cherry picked from commit ac9ab037e9)
 2014-10-28 16:42:13 -07:00
Haohui Mai d51ea6a248 HDFS-7301. TestMissingBlocksAlert should use MXBeans instead of old web UI. Contributed by Zhe Zhang. 2014-10-28 16:28:17 -07:00
cnauroth c2790932bd HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit c6f04f391b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-28 14:17:35 -07:00
Kihwal Lee 946463efef HDFS-7213. processIncrementalBlockReport performance degradation. 
Contributed by Eric Payne.
(cherry picked from commit e226b5b40d)
 2014-10-28 14:55:16 -05:00
Kihwal Lee dabaf582eb HDFS-6663. Admin command to track file and locations from block id. 
Contributed by Chen He.
(cherry picked from commit 371a3b87ed)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
 2014-10-28 14:32:18 -05:00
yliu 8b812a35b8 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:16:34 +08:00
Harsh J 9548bb360b HDFS-6741. Improve permission denied message when FSPermissionChecker#checkOwner fails. Contributed by Stephen Chu and Harsh J. (harsh) 2014-10-28 12:24:14 +05:30
yliu 2e156f01a2 HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) 2014-10-28 14:44:13 +08:00
Colin Patrick Mccabe 296c4064fc HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC (Jinghui Wang via Colin P. McCabe) 
(cherry picked from commit 518a7f4af3)
 2014-10-27 17:45:15 -07:00
Haohui Mai 0e05624618 HDFS-5928. Show namespace and namenode ID on NN dfshealth page. Contributed by Siqi Li. 2014-10-27 16:25:03 -07:00
cnauroth 3d67da502a HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth. 
(cherry picked from commit 463aec1171)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-10-27 11:50:47 -07:00
Jing Zhao 57e82e647b HDFS-7296. HdfsConstants#MEMORY_STORAGE_POLICY_ID and HdfsConstants#MEMORY_STORAGE_POLICY_ID are missing in branch-2. Contributed by Jing Zhao. 2014-10-27 11:20:57 -07:00
Colin Patrick Mccabe 5f3d967aae HDFS-7278. Add a command that allows sysadmins to manually trigger full block reports from a DN (cmccabe) 
(cherry picked from commit baf794dc40)
 2014-10-27 10:13:32 -07:00
Harsh J 8d781aaad3 HDFS-6538. Comment format error in ShortCircuitRegistry javadoc. Contributed by David Luo. (harsh) 2014-10-27 19:26:02 +05:30
Byron Wong d991cd52d8 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. 2014-10-25 12:39:03 -07:00
Colin Patrick Mccabe 2bcda17ee7 HDFS-6988. Improve HDFS-6581 eviction configuration (Xiaoyu Yao via Colin P. McCabe) 
(cherry picked from commit a52eb4bc5f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-10-24 13:17:59 -07:00
Jitendra Pandey 5fb7660ad6 HDFS-6904. Added files missing in previous commit. 2014-10-24 12:01:54 -07:00
Jitendra Pandey b576890f35 HDFS-6904. YARN unable to renew delegation token fetched via webhdfs due to incorrect service port. 2014-10-24 11:36:54 -07:00
Haohui Mai 1f6258f535 HDFS-7283. Bump DataNode OOM log from WARN to ERROR. Contributed by Stephen Chu. 2014-10-24 10:50:28 -07:00
Haohui Mai a4bb56b93b HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG level instead of INFO level. Contributed by Xiaoyu Yao. 2014-10-23 23:58:49 -07:00
yliu 193724ccaf HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu) 2014-10-24 11:41:49 +08:00
Colin Patrick Mccabe caa658a015 HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe) 
(cherry picked from commit 5b56ac4c72)
 2014-10-23 19:15:08 -07:00
Haohui Mai 92ad210699 HDFS-7257. Add the time of last HA state transition to NN's /jmx page. Contributed by Charles Lamb. 2014-10-23 16:53:17 -07:00
Allen Wittenauer a58f88056c HDFS-7232. Populate hostname in httpfs audit log (Zoran Dimitrijevic via aw) 2014-10-23 14:07:07 -07:00
Andrew Wang d3b9e9be24 HDFS-7222. Expose DataNode network errors as a metric. (Charles Lamb via wang) 
(cherry picked from commit 86cad007d7)
 2014-10-23 12:53:39 -07:00
Brandon Li d27cd5ad77 HDFS-7180. NFSv3 gateway frequently gets stuck due to GC. Contributed by Brandon Li 
(cherry picked from commit d71d40a63d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-22 21:34:15 -07:00
Haohui Mai 59e0ea8779 HDFS-7277. Remove explicit dependency on netty 3.2 in BKJournal. Contributed by Haohui Mai. 2014-10-22 17:32:30 -07:00
Andrew Wang c8d0758656 HDFS-6824. Additional user documentation for HDFS encryption. 
(cherry picked from commit a36399e09c)
 2014-10-22 14:39:00 -07:00
Tsz-wo Sze 3e2889f3c7 HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242636 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit dc847b39fd)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
 2014-10-22 14:37:15 -07:00
Colin Patrick Mccabe caaf778768 HDFS-6877. Avoid calling checkDisk when an HDFS volume is removed during a write. (Lei Xu via Colin P. McCabe) 
(cherry picked from commit 7b0f9bb258)
 2014-10-22 13:38:56 -07:00
Colin Patrick Mccabe c212347d32 HDFS-7254. Add documentation for hot swaping DataNode drives (Lei Xu via Colin P. McCabe) 
(cherry picked from commit 66e8187ea1)
 2014-10-22 13:28:34 -07:00
Jing Zhao 75a9c894b3 HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang. 2014-10-22 10:49:06 -07:00
Andrew Wang 2d0996ae6d HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. 
(cherry picked from commit ac56b0637e)
 2014-10-21 12:55:48 -07:00
Brandon Li c800e058ea HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li 
(cherry picked from commit 4e134a02a4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-21 11:55:18 -07:00
Brandon Li 33e020cb19 HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li 2014-10-21 11:01:27 -07:00
Colin Patrick Mccabe 8c3b007236 HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via Colin P. McCabe) 
(cherry picked from commit 7aab5fa1bd)
 2014-10-20 18:33:44 -07:00
Colin Patrick Mccabe 4eef6dcb58 HDFS-7266. HDFS Peercache enabled check should not lock on object (awang via cmccabe) 
(cherry picked from commit 4799570dfd)
 2014-10-20 18:25:36 -07:00
Tsz-Wo Nicholas Sze 4aae0fe976 HDFS-7260. Change DFSOutputStream.MAX_PACKETS to be configurable. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-10-17 18:35:14 -07:00
arp 0ee251ea26 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-10-17 13:42:04 -07:00
cnauroth a181daf458 HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-17 13:42:03 -07:00
cnauroth 69aacf19c1 HDFS-7112. LazyWriter should use either async IO or one thread per physical disk. Contributed by Xiaoyu Yao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-17 13:42:03 -07:00