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 |
|
Haohui Mai
|
d777a1e4ca
|
HADOOP-11369. Fix new findbugs warnings in hadoop-mapreduce-client, non-core directories. Contributed by Li Lu.
|
2014-12-09 10:46:13 -08:00 |
|
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 |
|
Zhijie Shen
|
51af8d367d
|
YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai.
|
2014-12-01 19:04:04 -08:00 |
|
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 |
|
Jonathan Eagles
|
c298a9a845
|
YARN-2375. Allow enabling/disabling timeline server per framework. (Mit Desai via jeagles)
|
2014-11-20 23:34:35 -06: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 |
|
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
|
43cd07b408
|
YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles.
|
2014-11-09 14:57:37 -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 |
|
Jian He
|
73068f677b
|
MAPREDUCE-6048. Fixed TestJavaSerialization failure. Contributed by Varun Vasudev
|
2014-11-04 20:19:54 -08:00 |
|
Haohui Mai
|
d794f785de
|
HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter.
|
2014-11-04 17:52:03 -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 |
|
Vinod Kumar Vavilapalli
|
e0233c16eb
|
YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan.
|
2014-10-30 22:59:31 -07: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 |
|
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 |
|
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 |
|
Zhijie Shen
|
0f3b6900be
|
YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He.
|
2014-10-23 21:56:03 -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 |
|
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 |
|
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 |
|
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
|
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 |
|
Colin Patrick Mccabe
|
d8d628d1e0
|
HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe)
|
2014-10-09 17:05:35 -07:00 |
|
Jason Lowe
|
2e789eb226
|
MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai
|
2014-10-07 14:10:39 +00:00 |
|
subru
|
3f282762d1
|
MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit aa92dd45f2d8c89a8a17ad2e4449aa3ff08bc53a)
|
2014-10-03 15:42:59 -07:00 |
|
Jason Lowe
|
23fbfe36c3
|
MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA
|
2014-09-29 18:12:59 +00:00 |
|
Jason Lowe
|
cf4631d7c9
|
HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee
|
2014-09-29 14:36:29 +00: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
|
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 |
|
Allen Wittenauer
|
aa1052c34b
|
YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw)
|
2014-09-19 14:07:38 -07: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 |
|
Zhijie Shen
|
6fe5c6b746
|
YARN-2568. Fixed the potential test failures due to race conditions when RM work-preserving recovery is enabled. Contributed by Jian He.
|
2014-09-18 21:56:56 -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
|
1cf3198047
|
MAPREDUCE-6090. mapred hsadmin getGroups fails to connect in some cases. Contributed by Robert Kanter
|
2014-09-18 21:00:53 +00:00 |
|
Vinod Kumar Vavilapalli
|
14e2639fd0
|
YARN-611. Added an API to let apps specify an interval beyond which AM failures should be ignored towards counting max-attempts. Contributed by Xuan Gong.
|
2014-09-13 18:04:05 -07:00 |
|
Todd Lipcon
|
8a3a327cd3
|
MAPREDUCE-2841. Merge remote-tracking branch 'apache/MR-2841' into trunk
|
2014-09-12 18:31:53 -07:00 |
|
Jian He
|
3122daa802
|
YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA
|
2014-09-12 10:33:33 -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 |
|
Sean Zhong
|
52a8b4db92
|
MAPREDUCE-6077. native-task: Remove CustomModule examples in nativetask (seanzhong)
|
2014-09-06 11:46:07 +08:00 |
|
Todd Lipcon
|
7c91f9b148
|
MAPREDUCE-6074. native-task: Fix release audit warnings
|
2014-09-05 19:58:41 -07:00 |
|
Todd Lipcon
|
4b3f1e2ce4
|
Merge remote-tracking branch 'apache/trunk' into MR-2841
|
2014-09-05 10:47:27 -07:00 |
|
Todd Lipcon
|
683987be7c
|
MAPREDUCE-6069. Lint/style fixes and removal of unused code. Contributed by Todd Lipcon.
|
2014-09-05 10:44:38 -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 |
|
Binglin Chang
|
00322161b5
|
MAPREDUCE-6067. native-task: fix some counter issues (Binglin Chang)
|
2014-09-05 14:20:39 +08: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 |
|
Todd Lipcon
|
1081d9cee2
|
MAPREDUCE-6055. native-task: findbugs, interface annotations, and other misc cleanup
|
2014-09-03 12:22:38 -07:00 |
|
Todd Lipcon
|
cce7d1e2f9
|
Merge remote-tracking branch 'origin/trunk' into MR-2841
Conflicts:
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
|
2014-09-02 15:55:54 -07:00 |
|
Binglin Chang
|
7ade9b04ea
|
MAPREDUCE-6056. native-task: move system test working dir to target dir and cleanup test config xml files (Manu Zhang via bchang)
|
2014-09-02 16:26:09 +08:00 |
|
Binglin Chang
|
17cd0faace
|
MAPREDUCE-6058. native-task: KVTest and LargeKVTest should check mr job is sucessful (Contributed by Binglin Chang)
|
2014-09-02 11:00:48 +08: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 |
|
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 |
|
Todd Lipcon
|
bfd1d75d87
|
MAPREDUCE-6054. native-task: Speed up tests. Contributed by Todd Lipcon.
|
2014-08-27 12:25:49 -07:00 |
|
Todd Lipcon
|
fad4524c85
|
MAPREDUCE-5977. Fix or suppress native-task gcc warnings. Contributed by Manu Zhang.
|
2014-08-27 12:25:42 -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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|