big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,115 Commits 2 Branches 2 Tags 264 MiB
6cbd9f1113
Commit Graph

1599 Commits

Author SHA1 Message Date
Jason Lowe
0c588904f8 MAPREDUCE-6160. Potential NullPointerException in MRClientProtocol interface implementation. Contributed by Rohith 2014-12-01 22:39:22 +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
Jian He
78f7cdbfd6 MAPREDUCE-5568. Fixed CompletedJob in JHS to show progress percentage correctly in case the number of mappers or reducers is zero. Contributed by MinJi Kim 2014-11-25 13:02:55 -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
1e9a3f42ff Update release date for 2.5.2 2014-11-21 14:34:23 -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
Devaraj K
7250b0bf91 MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown 
fails. Contributed by Rohith.
 2014-11-18 22:05:13 +05:30
Jason Lowe
09b3dee122 MAPREDUCE-6162. mapred hsadmin fails on a secure cluster. Contributed by Jason Lowe 2014-11-17 22:59:59 +00:00
Jason Lowe
3baaa42945 MAPREDUCE-6161. mapred hsadmin command missing from trunk. Contributed by Allen Wittenauer 2014-11-14 21:10:06 +00: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
Arun C. Murthy
9ff7315cbe Preparing to release hadoop-2.6.0-rc1. 2014-11-13 13:02:55 -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
Karthik Kambatla
68a0508728 Set the release date for 2.5.2 2014-11-10 15:22:53 -08:00
Arun C. Murthy
770cc14442 Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 2014-11-09 18:47:21 -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
Jian He
73068f677b MAPREDUCE-6048. Fixed TestJavaSerialization failure. Contributed by Varun Vasudev 2014-11-04 20:19:54 -08:00
Karthik Kambatla
4de56d27fb Adding release 2.5.2 to CHANGES.txt 2014-11-04 16:50:40 -08: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
Kihwal Lee
b056048114 MAPREDUCE-6022. map_input_file is missing from streaming job 
environment. Contributed by Jason Lowe.
 2014-10-29 12:29:07 -05:00
Vinod Kumar Vavilapalli
3f1441245d MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen. 2014-10-29 09:57:39 -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
Zhijie Shen
6b2f11b54b MAPREDUCE-5933. Enabled MR AM to post history events to the timeline server. Contributed by Robert Kanter. 2014-10-27 20:35:40 -07:00
Jian He
d67214fd69 Updated CHANGES.txt to move MAPREDUCE-6126 to 2.6 2014-10-22 10:50:36 -07:00
Jian He
b8f7966c7a MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du 2014-10-22 10:43:20 -07:00
Ivan Mitic
da80c4da41 Revert "MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita." 
This reverts commit 7bbda6ef92.
 2014-10-19 23:57:12 -04:00
Ivan Mitic
7bbda6ef92 MAPREDUCE-5911. Terasort TeraOutputFormat does not check for output directory existance. Contributed by Bruno P. Kinoshita. 2014-10-19 18:57:48 -04:00
Jason Lowe
209b1699fc MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith 2014-10-17 19:51:10 +00: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
Jason Lowe
793dbf2465 MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk. Contributed by Binglin Chang 2014-10-13 16:04:14 +00:00
Jason Lowe
bbe80cdc7b MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails. Contributed by Mit Desai 2014-10-13 15:08:23 +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
777877d079 MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. 2014-10-09 22:35:58 -07:00
cnauroth
2f0166db56 MAPREDUCE-6122. Fix CHANGES.txt. 2014-10-09 22:32:28 -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
Jason Lowe
2e789eb226 MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai 2014-10-07 14:10:39 +00:00
Arun C. Murthy
ea32a66f7d Preparing to branch hadoop-2.6 2014-09-30 10:26:42 -07:00
Jason Lowe
23fbfe36c3 MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA 2014-09-29 18:12:59 +00:00
Allen Wittenauer
4666440b1a MAPREDUCE-6072. Remove INSTALL document (Akira AJISAKA via aw) 2014-09-29 08:30:06 -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
c7c8e388a9 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:25:49 -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
Allen Wittenauer
f614cb71d4 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) 2014-09-25 11:27:33 -07:00
Allen Wittenauer
6c3cebda3f MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang) 2014-09-25 07:57:01 -07:00
Jason Lowe
7af4c3888b MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai 2014-09-24 16:09:33 +00:00
Zhijie Shen
376233cdd4 MAPREDUCE-5279. Made MR headroom calculation honor cpu dimension when YARN scheduler resource type is memory plus cpu. Contributed by Peng Zhang and Varun Vasudev. 2014-09-22 09:28:47 -07:00
Jason Lowe
7039b98e1c MAPREDUCE-6095. Enable DistributedCache for uber-mode Jobs. Contributed by Gera Shegalov 2014-09-22 15:20:59 +00:00
Jason Lowe
951847ba94 MAPREDUCE-6091. YARNRunner.getJobStatus() fails with ApplicationNotFoundException if the job rolled off the RM view. Contributed by Sangjin Lee 2014-09-19 20:15:54 +00: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
Jason Lowe
1cf3198047 MAPREDUCE-6090. mapred hsadmin getGroups fails to connect in some cases. Contributed by Robert Kanter 2014-09-18 21:00:53 +00:00
Todd Lipcon
3c9181722b Merge MR-2841 changes into main MapReduce CHANGES.txt file 2014-09-12 18:35:13 -07:00
Karthik Kambatla
17ffbe0864 Update CHANGES.txt to set the release date for 2.5.1 2014-09-11 17:35:35 -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
Jason Lowe
7f80e14209 MAPREDUCE-6075. HistoryServerFileSystemStateStore can create zero-length files. Contributed by Jason Lowe 2014-09-10 22:22:39 +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
Jason Lowe
45efc966ee MAPREDUCE-6071. JobImpl#makeUberDecision doesn't log that Uber mode is disabled because of too much CPUs. Contributed by Tsuyoshi OZAWA 2014-09-05 13:42:00 +00: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
Jason Lowe
15366d9227 MAPREDUCE-5931. Validate SleepJob command line parameters. Contributed by Gera Shegalov 2014-08-29 19:50:15 +00:00
Chris Douglas
48aa3b7274 Fix typos in log messages. Contributed by Ray Chiang 2014-08-28 16:29:35 -07:00
Alejandro Abdelnur
d9a7404c38 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:10:59 -07:00
Jason Lowe
812bd0c0e5 MAPREDUCE-5885. build/test/test.mapred.spill causes release audit warnings. Contributed by Chen He 2014-08-27 15:14:54 +00:00
Karthik Kambatla
2d9b77d617 Fix CHANGES.txt entry for MAPREDUCE-6033. 2014-08-27 01:16:52 -07:00
Karthik Kambatla
dc154ab86d Add a section for 2.5.1 in CHANGES.txt 2014-08-27 00:55:19 -07:00
Zhijie Shen
524a63e59e MAPREDUCE-6044. Fully qualified intermediate done dir path breaks per-user dir creation on Windows. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619863 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 17:06:23 +00: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
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
Karthik Kambatla
9b8250c742 Set the release date for 2.5.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619237 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 21:33:19 +00:00
Andrew Wang
b0f0ef17f0 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619203 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:56:56 +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
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
Jason Darrell Lowe
d51f81c3b6 MAPREDUCE-6036. TestJobEndNotifier fails intermittently in branch-2. Contributed by chang li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618691 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:18:22 +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
Eric Yang
08d6201b34 MAPREDUCE-6033. Updated access check for displaying job information 
(Yu Gao via Eric Yang)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618648 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 16:13:56 +00:00
Zhijie Shen
ddf108449d MAPREDUCE-6032. Fix the non-unicode character in the change log in CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618270 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 20:25:51 +00:00
Zhijie Shen
84bc2fe402 MAPREDUCE-6032. Made MR jobs write job history files on the default FS when the current context’s FS is different. Contributed by Benjamin Zhitomirsky. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618269 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 20:17:45 +00:00
Allen Wittenauer
31e478905a Wrong categorization for a variety of commits in the CHANGES.txt files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 16:47:34 +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
Jason Darrell Lowe
9579554988 MAPREDUCE-6010. HistoryServerFileSystemStateStore fails to update tokens. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617984 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:55:03 +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
Allen Wittenauer
cc93c1fd75 MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617804 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:18:50 +00:00
Jason Darrell Lowe
de2595833c MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616585 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:15:56 +00:00
Jason Darrell Lowe
857d134fda MAPREDUCE-6014. New task status field in task attempts table can lead to an empty web page. Contributed by Mit Desai 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:52:22 +00:00
Xuan Gong
e52f67e389 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik,and Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614981 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 20:06:02 +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
Jason Darrell Lowe
60b1e835e0 MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612652 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 19:22:24 +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