Commit Graph

609 Commits

Author SHA1 Message Date
Tsuyoshi Ozawa d1c6accb6f HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-03-03 14:17:52 +09:00
Akira Ajisaka bfbf076b7d MAPREDUCE-5612. Add javadoc for TaskCompletionEvent.Status. Contributed by Chris Palmer. 2015-02-26 15:05:17 -08:00
Karthik Kambatla 1047c883ba MAPREDUCE-6223. TestJobConf#testNegativeValueForTaskVmem failures. (Varun Saxena via kasha) 2015-02-26 14:24:19 -08:00
Akira Ajisaka 9a37247a67 MAPREDUCE-2815. JavaDoc does not generate correctly for MultithreadedMapRunner. Contributed by Chris Palmer. 2015-02-24 12:10:17 -08:00
Akira Ajisaka 0d7d508c82 MAPREDUCE-6264. Remove httpclient dependency from hadoop-mapreduce-client. Contributed by Brahma Reddy Battula. 2015-02-24 11:34:26 -08:00
Tsuyoshi Ozawa 9cedad11d8 Revert "HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa)"
This reverts commit 946456c6d8.

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/QuotaByStorageTypeEntry.java
2015-02-25 00:32:04 +09:00
Tsuyoshi Ozawa 946456c6d8 HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-02-19 13:06:53 +09:00
Jason Lowe 4981d082d4 MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice. Contributed by Tsuyoshi OZAWA 2015-02-18 19:28:02 +00:00
Allen Wittenauer 8b787e2fdb MAPREDUCE-6260. Convert site documentation to markdown (Masatake Iwasaki via aw) 2015-02-17 06:52:14 -10:00
Junping Du 814afa46ef MAPREDUCE-6225. Fix new findbug warnings in hadoop-mapreduce-client-core. Contributed by Varun Saxena 2015-02-16 09:38:05 -08:00
Tsuyoshi Ozawa 3338f6d907 MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. Contributed by Naganarasimha G R. 2015-02-15 10:09:42 +09:00
Tsuyoshi Ozawa 9b0ba59b82 MAPREDUCE-6221. Stringifier is left unclosed in Chain#getChainElementConf(). Contributed by Ted Yu. 2015-02-13 02:27:54 +09:00
Tsuyoshi Ozawa ac8d52bf50 MAPREDUCE-4431. mapred command should print the reason on killing already completed jobs. Contributed by Devaraj K. 2015-02-12 20:35:57 +09:00
Tsuyoshi Ozawa b42d09eb62 MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. Contributed by Devaraj K. 2015-02-12 20:08:29 +09:00
Devaraj K 76e309ead0 MAPREDUCE-6253. Update use of Iterator to Iterable. Contributed by Ray
Chiang.
2015-02-12 13:45:19 +05:30
Tsuyoshi Ozawa 241336ca2b MAPREDUCE-6237. Multiple mappers with DBInputFormat don't work because of reusing conections. Contributed by Kannan Rajah. 2015-02-10 03:52:42 +09:00
Allen Wittenauer 9112f093cd HADOOP-10976. moving the source code of hadoop-tools docs to the directory under hadoop-tools (Masatake Iwasaki via aw) 2015-02-04 17:57:34 -08:00
Akira Ajisaka cc6bbfceae MAPREDUCE-5988. Fix dead links to the javadocs in mapreduce project. (aajisaka) 2015-02-04 17:46:01 -08:00
Akira Ajisaka bd69fb2d44 MAPREDUCE-5800. Use Job#getInstance instead of deprecated constructors. (aajisaka) 2015-02-03 14:30:09 -08:00
Robert Kanter 8acc5e9b4b MAPREDUCE-6143. add configuration for mapreduce speculative execution in MR2 (zxu via rkanter) 2015-02-02 13:51:08 -08:00
Jason Lowe 56b7ec71a6 MAPREDUCE-6141. History server leveldb recovery store. Contributed by Jason Lowe 2015-01-26 16:28:55 +00:00
Gera Shegalov a003f71cac MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via gera) 2015-01-21 18:42:03 -08:00
Xuan 10ac5abb86 MAPREDUCE-6173. Document the configuration of deploying MR over
distributed cache with enabling wired encryption at the same time.
Contributed by Junping Du.
2015-01-13 10:04:31 -08:00
Tsuyoshi Ozawa a6ed4894b5 HADOOP-11032. Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 2015-01-08 14:51:57 +09:00
Tsuyoshi Ozawa 9886396400 Revert "Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa)" because of missing JIRA's number.
This reverts commit 2eba7eb9af.
2015-01-08 14:35:08 +09:00
Tsuyoshi Ozawa 2eba7eb9af Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 2015-01-08 14:21:30 +09:00
Jason Lowe a0aeed100b MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems. Contributed by Jens Rabe 2015-01-06 23:39:43 +00:00
Jason Lowe d02fb53750 HADOOP-11445. Bzip2Codec: Data block is skipped when position of newly created stream is equal to start of split. Contributed by Ankit Kamboj 2015-01-06 21:19:10 +00:00
Harsh J 6621c3598e MAPREDUCE-6149. Document override log4j.properties in MR job. Contributed by Junping Du. 2014-12-30 23:12:51 +05:30
Robert Kanter 390a7c12f5 MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter) 2014-12-19 15:43:48 -08:00
Karthik Kambatla 6f1e3667cf HADOOP-11213. Typos in html pages: SecureMode and EncryptedShuffle. (Wei Yan via kasha) 2014-12-19 15:00:28 -08:00
Gera Shegalov af006937e8 MAPREDUCE-6166. Reducers do not validate checksum of map outputs when fetching directly to disk. (Eric Payne via gera) 2014-12-15 19:08:59 -08:00
Harsh J 298d09c9b5 MAPREDUCE-6194. Bubble up final exception in failures during creation of output collectors. Contributed by Varun Saxena. 2014-12-15 14:26:43 +05:30
Gera Shegalov 0bcea111e5 HADOOP-11211. mapreduce.job.classloader.system.classes semantics should be order-independent. (Yitong Zhou via gera) 2014-12-11 13:12:13 -08:00
Harsh J cb99f43305 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) 2014-12-11 09:45:49 +05:30
Harsh J 8963515b88 MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh) 2014-12-08 15:57:52 +05:30
Jason Lowe 03ab24aa01 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov 2014-12-03 17:02:14 +00:00
Jason Lowe 2b30fb1053 MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena 2014-12-01 21:51:05 +00:00
Karthik Kambatla a655973e78 Revert "MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha)"
This reverts commit a4df9eed05.
2014-11-25 16:24:26 -08:00
Karthik Kambatla a4df9eed05 MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha) 2014-11-21 18:36:41 -08:00
Karthik Kambatla 90194ca1cb MAPREDUCE-6169. MergeQueue should release reference to the current item from key and value at the end of the iteration to save memory. (Zhihai Xu via kasha) 2014-11-20 15:36:57 -08:00
Ravi Prakash 1a1dcce827 MAPREDUCE-5918. LineRecordReader can return the same decompressor to CodecPool multiple times (Sergey Murylev via raviprak) 2014-11-14 03:45:53 -08:00
Jason Lowe 177e8090f5 MAPREDUCE-6156. Fetcher - connect() doesn't handle connection refused correctly. Contributed by Junping Du 2014-11-13 15:42:25 +00:00
cnauroth 0abb973f09 HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA. 2014-11-12 21:41:19 -08:00
Arun C. Murthy 6caa8100d5 HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs. 2014-11-08 15:39:56 -08:00
Kihwal Lee 8f701ae07a MAPREDUCE-5958. Wrong reduce task progress if map output is compressed. Contributed by Emilio Coppa and Jason Lowe. 2014-11-06 15:53:40 -06:00
Jason Lowe 10f9f5101c MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov 2014-11-06 15:10:40 +00:00
Zhijie Shen ed63b11646 MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du. 2014-11-01 00:47:57 -07:00
Karthik Kambatla 3c5f5af118 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) 2014-10-28 18:03:00 -07:00
Zhijie Shen 971e91c8c0 MAPREDUCE-6018. Added an MR specific config to enable emitting job history data to the timeline server. Contributed by Robert Kanter. 2014-10-27 21:03:53 -07:00
Jian He 3b12fd6cfb YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu 2014-10-22 15:57:46 -07:00
Jian He 0af1a2b5bc YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:22:07 -07:00
Jason Lowe f19771a24c MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov 2014-10-15 17:50:31 +00:00
Jason Lowe b9edad6403 MAPREDUCE-5873. Shuffle bandwidth computation includes time spent waiting for maps. Contributed by Siqi Li 2014-10-15 15:52:53 +00:00
Karthik Kambatla e8a31f2e1c MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha) 2014-10-11 22:49:06 -07:00
cnauroth 684170d5ef MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth. 2014-10-09 22:25:17 -07:00
subru 3f282762d1 MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit aa92dd45f2)
2014-10-03 15:42:59 -07:00
Jian He 5f16c98ad6 MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA 2014-09-26 18:05:26 -07:00
Allen Wittenauer b40f433cf8 MAPREDUCE-5796. Use current version of the archive name in DistributedCacheDeploy document (Akira AJISAKA via aw) 2014-09-26 12:59:20 -07:00
Allen Wittenauer 1147b9ae16 MAPREDUCE-6073. Description of mapreduce.job.speculative.slowtaskthreshold in mapred-default should be moved into description tags (Tsuyoshi OZAWA via aw) 2014-09-26 11:16:12 -07:00
Zhijie Shen 662fc11ae7 MAPREDUCE-5831. Make MR client ignore unknown counters received from AM. Contributed by Junping Du. 2014-09-25 23:45:07 -07:00
Allen Wittenauer 6c54308423 MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) 2014-09-25 11:31:48 -07:00
Karthik Kambatla 52945a33cc MAPREDUCE-6086. mapreduce.job.credentials.binary should allow all URIs. (Zhihai Xu via kasha) 2014-09-18 15:46:52 -07:00
Jason Lowe 2c3da25fd7 MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du 2014-09-18 22:00:11 +00:00
Andrew Wang fe2f54d4cb HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) 2014-09-18 14:51:08 -07:00
Jason Lowe 9e28e089c6 MAPREDUCE-6070. yarn.app.am.resource.mb/cpu-vcores affects uber mode but is not documented. Contributed by Tsuyoshi OZAWA 2014-09-11 16:19:23 +00:00
Allen Wittenauer d989ac0444 MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw) 2014-09-08 13:15:46 -07:00
Chris Douglas a18424e724 MAPREDUCE-6063. Correct spill size calculation for spills wrapping the circular buffer. Contributed by zhihai xu. 2014-09-03 17:01:59 -07:00
Andrew Wang ea1c6f31c2 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang. 2014-08-29 14:44:37 -07:00
Chris Douglas 48aa3b7274 Fix typos in log messages. Contributed by Ray Chiang 2014-08-28 16:29:35 -07:00
Sanford Ryza 5109157ed1 MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619626 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:28:44 +00:00
Jason Darrell Lowe da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:38:16 +00:00
Karthik Kambatla e5e9d792c7 MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619492 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 17:37:34 +00:00
Allen Wittenauer ef32d09030 [post-HADOOP-9902] mapred version is missing (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619201 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:47:10 +00:00
Andrew Wang d2a39b61aa Merge from trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 01:22:42 +00:00
Andrew Wang 0cc08f6da4 Merge from trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:41:31 +00:00
Karthik Kambatla 73325f23f6 MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618694 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:25:50 +00:00
Zhijie Shen f8e871d01b MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618677 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 17:57:48 +00:00
Jason Darrell Lowe 7378af7bca MAPREDUCE-5878. some standard JDK APIs are not part of system classes defaults. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618080 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 23:17:33 +00:00
Allen Wittenauer 2d904b3fa3 MAPREDUCE-5906. Inconsistent configuration in property "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618007 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 18:07:06 +00:00
Allen Wittenauer e1f15d2cdf MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618003 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:56:53 +00:00
Allen Wittenauer 7557f7bb2d MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617995 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:18:14 +00:00
Allen Wittenauer 6be98091f7 MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617994 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 17:11:39 +00:00
Allen Wittenauer 92054f2a06 MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors in mapreduce.Job (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617986 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 16:00:18 +00:00
Allen Wittenauer e7b540eced MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus and getStatus (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617982 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:49:10 +00:00
Allen Wittenauer 1e016e6451 MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default separator and how to change it (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617979 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:43:28 +00:00
Allen Wittenauer b3df973adb MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and Koji Noguchi via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617977 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 15:39:52 +00:00
Allen Wittenauer e51a5d691b MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617806 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:34:26 +00:00
Charles Lamb 041b8326a1 MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace extended attributes. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616657 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 01:32:18 +00:00
Charles Lamb 1d3e9ec935 merge from trunk r1613787
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613788 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 13:32:51 +00:00
Zhijie Shen 549bcc2c02 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613743 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 01:37:51 +00:00
Andrew Wang cb20bb6117 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:44:50 +00:00
Jason Darrell Lowe c2174a5536 MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612400 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:24:15 +00:00
Andrew Wang 56c0bd4d37 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 21:10:24 +00:00
Vinod Kumar Vavilapalli b60ef8b91b MAPREDUCE-5790. Made it easier to enable hprof profile options by default. Contributed by Gera Shegalov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610578 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 04:49:01 +00:00
Alejandro Abdelnur 95986dd2fb MAPREDUCE-5890. Support for encrypting Intermediate data and spills in local filesystem. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609597 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 00:43:03 +00:00
Vinod Kumar Vavilapalli 1355ff6132 MAPREDUCE-5830. Added back the private API HostUtil.getTaskLogUrl(..) for binary compatibility with older clients like Hive 0.13. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604230 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 18:28:21 +00:00
Karthik Kambatla 7b9c074b76 MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603957 13f79535-47bb-0310-9956-ffa450edef68
2014-06-19 17:22:56 +00:00
Karthik Kambatla bd23a2ff22 MAPREDUCE-5896. InputSplits should indicate which locations have the block cached in memory. (Sandy Ryza via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603670 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 23:28:50 +00:00
Chris Nauroth 180ac8dc1d MAPREDUCE-5912. Task.calculateOutputSize does not handle Windows files after MAPREDUCE-5196. Contributed by Remus Rusanu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602282 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 20:02:45 +00:00