Commit Graph

199 Commits

Author SHA1 Message Date
Andrew Wang 5d8b80ea9b Preparing for 3.0.0-alpha3 development 2017-01-19 15:50:07 -08:00
Jason Lowe a0a2761621 HADOOP-13578. Add Codec for ZStandard Compression. Contributed by churro morales 2017-01-04 14:46:25 +00:00
Akira Ajisaka 7d8e440eee Revert "HADOOP-13852 hadoop build to allow hadoop version property to be explicitly set. Contriibuted by Steve Loughran"
This reverts commit c265515725.
2016-12-09 12:49:27 +09:00
Steve Loughran c265515725 HADOOP-13852 hadoop build to allow hadoop version property to be explicitly set. Contriibuted by Steve Loughran 2016-12-08 17:57:15 +00:00
Akira Ajisaka b2a3d6c519 HADOOP-13835. Move Google Test Framework code from mapreduce to hadoop-common. Contributed by Varun Vasudev. 2016-12-06 14:01:47 +09:00
Akira Ajisaka 67d9f2808e HADOOP-13706. Update jackson from 1.9.13 to 2.x in hadoop-common-project. 2016-11-29 14:07:19 +09:00
Akira Ajisaka 209e805430 HADOOP-13506. Redundant groupid warning in child projects. Contributed by Kai Sasaki. 2016-11-28 14:34:57 +09:00
Wei-Chiu Chuang c0b1a44f6c HADOOP-13660. Upgrade commons-configuration version. Contributed by Sean Mackrory. 2016-11-17 22:48:35 -06:00
Andrew Wang e1c6ef2efa HADOOP-13789. Hadoop Common includes generated test protos in both jar and test-jar. Contributed by Sean Busbey. 2016-11-08 16:33:55 -08:00
Robert Kanter 5877f20f9c HADOOP-10075. Update jetty dependency to version 9 (rkanter) 2016-10-27 16:09:00 -07:00
Wei-Chiu Chuang d88dca844a HADOOP-11798. Native raw erasure coder in XOR codes. Contributed by SammiChen. 2016-10-25 16:53:53 -07:00
Andrew Wang 86c735bcb1 Revert "HADOOP-13696. change hadoop-common dependency scope of jsch to provided. Contributed by Yuanbo Liu."
This reverts commit cef61d505e.
2016-10-25 13:45:52 -07:00
Steve Loughran cef61d505e HADOOP-13696. change hadoop-common dependency scope of jsch to provided. Contributed by Yuanbo Liu. 2016-10-10 12:32:39 +01:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 99603e9022 HADOOP-13428. Fixed hadoop-common build files to generate jdiff by working around a jdiff-bug. Contributed by Wangda Tan. 2016-08-19 19:08:53 -07:00
Wei-Chiu Chuang 03a9343d57 HADOOP-12765. HttpServer2 should switch to using the non-blocking SslSelectChannelConnector to prevent performance degradation when handling SSL connections. Contributed by Min Shen. 2016-08-19 09:22:49 -07:00
Kai Zheng 34ccaa8367 HADOOP-11540. Raw Reed-Solomon coder using Intel ISA-L library. Contributed by Kai Zheng 2016-08-01 06:34:26 +08:00
Andrew Wang da456ffd62 Preparing for 3.0.0-alpha2 development 2016-07-15 19:04:17 -07:00
Tsuyoshi Ozawa 5d58858bb6 HADOOP-9613. [JDK8] Update jersey version to latest 1.x release. 2016-06-21 08:05:32 +09:00
Allen Wittenauer e2f640942b HADOOP-13245. Fix up some misc create-release issues (aw) 2016-06-14 16:03:20 -07:00
Kai Zheng 723432b338 HADOOP-13220. Follow on fixups after upgraded mini-kdc using Kerby. Contributed by Jiajia Li 2016-06-09 15:56:12 +08:00
Kai Zheng 916140604f HADOOP-12911. Upgrade Hadoop MiniKDC with Kerby. Contributed by Jiajia Li 2016-05-28 14:23:39 +08:00
Andrew Wang 3c5c57af28 HADOOP-13142. Change project version from 3.0.0 to 3.0.0-alpha1. 2016-05-12 18:27:28 -07:00
Andrew Wang ca5613af91 Revert "Update project version to 3.0.0-alpha1-SNAPSHOT."
This reverts commit 6b53802cba.
2016-05-12 15:32:45 -07:00
Andrew Wang 6b53802cba Update project version to 3.0.0-alpha1-SNAPSHOT. 2016-05-12 11:05:05 -07:00
Chris Nauroth 89b16d27e2 HADOOP-12905. Clean up CHANGES.txt RAT exclusions from pom.xml files. Contributed by Chris Nauroth. 2016-03-08 21:22:06 -08:00
Masatake Iwasaki 809ebc0b14 HADOOP-12552. Fix undeclared/unused dependency to httpclient (iwasakims) 2016-02-29 18:20:14 +09:00
Allen Wittenauer 79d7949fbb HADOOP-12492. maven install triggers bats test (aw) 2016-01-27 11:27:27 -08:00
Allen Wittenauer 8cecad2d56 HADOOP-12651. Replace dev-support with wrappers to Yetus (aw) 2016-01-21 12:22:03 -08:00
Colin Patrick Mccabe b1ed28fa77 HADOOP-8887. Use a Maven plugin to build the native code using CMake (cmccabe) 2016-01-14 11:02:34 -08:00
Colin Patrick Mccabe f349d0a76c HADOOP-12647. Add /usr/lib default for ISAL library and fix missing .c file in CMakeLists (Kai Zheng via cmccabe) 2015-12-18 09:27:26 -08:00
Allen Wittenauer 607473e1d0 HADOOP-12192. update releasedocmaker command line (aw) 2015-12-16 06:23:58 -08:00
Colin Patrick Mccabe 482e35c55a HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe) 2015-11-05 10:44:47 -08:00
Allen Wittenauer 6e0d353235 HADOOP-12541. make re2j dependency consistent (Matthew Paduano via aw) 2015-11-02 20:39:46 -08:00
Allen Wittenauer 4c0bae240b HADOOP-12436. GlobPattern regex library has performance issues with wildcard characters (Matthew Paduano via aw) 2015-10-22 08:19:56 -07:00
Allen Wittenauer dc45a7a7c4 Revert "HADOOP-12436. GlobPattern regex library has performance issues with wildcard characters (Matthew Paduano via aw)"
This reverts commit 0d77e85f0a.
2015-10-15 08:26:06 -07:00
Allen Wittenauer 0d77e85f0a HADOOP-12436. GlobPattern regex library has performance issues with wildcard characters (Matthew Paduano via aw) 2015-10-14 08:59:41 -07:00
Colin Patrick Mccabe 892ade689f HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 2015-09-28 07:42:12 -07:00
Vinayakumar B f0f984e4e6 HADOOP-11984. Enable parallel JUnit tests in pre-commit (Contributed by Chris Nauroth) 2015-09-27 14:12:07 +05:30
yliu f4d96be6c6 HADOOP-12367. Move TestFileUtil's test resources to resources folder. (wang via yliu) 2015-09-01 16:20:56 +08:00
Allen Wittenauer a890a31529 HADOOP-10854. unit tests for the shell scripts (aw) 2015-07-31 14:34:48 -07:00
Chris Douglas 559425dcb9 HADOOP-5732. Add SFTPFileSystem. Contributed by Ramtin Boustani and Inigo Goiri 2015-07-07 10:08:59 -07:00
Andrew Wang 7673d4f205 HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
Allen Wittenauer ae14543420 HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout remaining forrest bits (aw) 2015-05-28 13:24:01 -07:00
Vinayakumar B 55ed6558ba HADOOP-11743. maven doesn't clean all the site files (Contributed by ramtin) 2015-05-22 16:45:19 +05:30
Allen Wittenauer f325522c14 HADOOP-11813. releasedocmaker.py should use today's date instead of unreleased (Darrell Taylor via aw) 2015-05-06 10:34:09 -07:00
Allen Wittenauer f383fd9b6c HADOOP-11731. Rework the changelog and releasenotes (aw) 2015-04-01 17:52:22 -07:00
Allen Wittenauer b30ca8ce0e HADOOP-11553. Foramlize the shell API (aw) 2015-03-26 15:09:51 -07:00
Colin Patrick Mccabe 09ad9a868a HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe) 2015-01-30 16:01:59 -08:00
Colin Patrick Mccabe fb20797b62 HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe) 2014-12-15 18:55:16 -08:00
Haohui Mai 1eed102023 HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. 2014-11-04 10:52:05 -08:00
yliu 2a6be65c8c HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu) 2014-10-30 10:35:14 +08: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
Colin Patrick Mccabe d8d628d1e0 HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe) 2014-10-09 17:05:35 -07:00
Colin Patrick Mccabe 55302ccfba HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe) 2014-09-26 10:30:30 -07:00
Alejandro Abdelnur db890eef32 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 2014-09-20 08:21:44 -07:00
Alejandro Abdelnur c0c7e6fabd HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) 2014-09-16 23:36:36 -07:00
Colin Patrick Mccabe 6962510f72 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 2014-08-27 14:12:05 -07:00
Charles Lamb 74f7be0887 merge from trunk r1617527
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:02:07 +00:00
Alejandro Abdelnur be9c67930b HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:58:58 +00:00
Colin McCabe 905c90b066 HADOOP-10734. Implement high-performance secure random number sources. (Yi Liu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609874 13f79535-47bb-0310-9956-ffa450edef68
2014-07-12 01:29:26 +00:00
Andrew Wang dda85637df Merge trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1608603 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:43:56 +00:00
Colin McCabe bfef9807a0 HADOOP-10693. Implementation of AES-CTR CryptoCodec using JNI to OpenSSL (hitliuyi via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607768 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 23:40:31 +00:00
Haohui Mai fdbff67856 HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of going remote. Contributed by Dapeng Sun.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605146 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:51:21 +00:00
Haohui Mai 22cbcd16cb HADOOP-10717. Revert r1603571.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603620 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 20:37:25 +00:00
Steve Loughran bae5837d3b HADOOP-10717. Missing JSP support in Jetty
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603534 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 17:08:45 +00:00
Arpit Agarwal 34e9173c00 HADOOP-10376. Refactor refresh*Protocols into a single generic refreshConfigProtocol. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602055 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 01:27:39 +00:00
Haohui Mai d777cb8996 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592069 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 22:26:02 +00:00
Alejandro Abdelnur b4f0259f13 HADOOP-10428. JavaKeyStoreProvider should accept keystore password via configuration falling back to ENV VAR. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586216 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 05:09:12 +00:00
Haohui Mai 8ca32df08e HADOOP-10474. Move o.a.h.record to hadoop-streaming. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585886 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 04:02:46 +00:00
Arpit Agarwal d00605f8f0 HADOOP-10285. Admin interface to swap callqueue at runtime. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573052 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:48:31 +00:00
Colin McCabe 140246bad8 HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563362 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:25:33 +00:00
Owen O'Malley 7730629164 HADOOP-10141. Create KeyProvider API to separate encryption key storage
from the applications. (omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552462 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 00:25:42 +00:00
Steve Loughran bd5b23f4ce HADOOP-10067 Missing POM dependency on jsr305
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541862 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 09:43:51 +00:00
Steve Loughran 4a0f804d5e MAPREDUCE-5431 Missing pom dependency in MR-client
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541682 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:52:43 +00:00
Steve Loughran 70e464500b HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541672 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:36:54 +00:00
Suresh Srinivas 4e9c652c52 HADOOP-10003. HarFileSystem.listLocatedStatus() fails. Contributed by Jason Dere and suresh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528256 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:57:59 +00:00
Alejandro Abdelnur 27e7feb777 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523596 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:30:47 +00:00
Chris Nauroth 5eb618ee1f HDFS-4491. Parallel testing HDFS. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520479 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 03:06:41 +00:00
Sanford Ryza f6a1f4d1e0 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1515711 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 06:24:22 +00:00
Alejandro Abdelnur 8451ab5c01 HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514068 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:15:04 +00:00
Alejandro Abdelnur 19b36f0900 HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513281 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 22:15:10 +00:00
Chris Nauroth 1fafb1e1e0 HADOOP-9802. Support Snappy codec on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512872 13f79535-47bb-0310-9956-ffa450edef68
2013-08-11 05:51:34 +00:00
Luke Lu c8e200f2c2 HADOOP-9319. Update bundled LZ4 source to r99. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1510734 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 21:10:54 +00:00
Jason Darrell Lowe febc5040b9 HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503954 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:06:48 +00:00
Jason Darrell Lowe 85623a2d75 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488040 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 22:43:16 +00:00
Todd Lipcon c45c8ee720 Complete commit of prior merge.
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 16:47:16 +00:00
Tsz-wo Sze 0f4cad57b8 HADOOP-9353. Activate native-win maven profile by default on Windows. Contributed by Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460086 13f79535-47bb-0310-9956-ffa450edef68
2013-03-23 03:41:31 +00:00
Alejandro Abdelnur dfaa6b6abd HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating conflicts in Oozie & HttpFS. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457000 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 16:17:12 +00:00
Jason Darrell Lowe 85470f0a33 HADOOP-8462. Native-code implementation of bzip2 codec. Contributed by Govind Kamat
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453608 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 23:10:12 +00:00
Suresh Srinivas 50d136f9c9 HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453599 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 22:37:42 +00:00
Suresh Srinivas 638801cce1 HADOOP-8952. Enhancements to support Hadoop on Windows Server and Windows Azure environments. Contributed by Ivan Mitic, Chuan Liu, Ramya Sunil, Bikas Saha, Kanna Karanam, John Gordon, Brandon Li, Chris Nauroth, David Lao, Sumadhur Reddy Bolli, Arpit Agarwal, Ahmed El Baz, Mike Liddell, Jing Zhao, Thejas Nair, Steve Maine, Ganeshan Iyer, Raja Aluri, Giridharan Kesavan, Ramya Bharathi Nimmagadda.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453486 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 19:15:18 +00:00
Alejandro Abdelnur 5363d831a0 HADOOP-9342. Remove jline from distribution. (thw via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1451071 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 01:43:24 +00:00
Aaron Myers f61581501a Merge trunk into HDFS-347 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 01:12:07 +00:00
Alejandro Abdelnur 0a8cfa9016 HADOOP-9304. remove addition of avro genreated-sources dirs to build. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446296 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 18:48:14 +00:00
Alejandro Abdelnur 4ad1279b2e HADOOP-9297. remove old record IO generation and tests. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446044 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:27:07 +00:00
Alejandro Abdelnur 6bcbf492a2 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:13:44 +00:00
Suresh Srinivas 71a57ded39 HADOOP-9264. Port change to use Java untar API on Windows from branch-1-win to trunk. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441172 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 20:13:01 +00:00
Suresh Srinivas b04586e7eb HADOOP-9264. Reverting r1441164 and wait for Jenkins results before committing the patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441166 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 19:49:06 +00:00
Suresh Srinivas e6ef76999f HADOOP-9264. Port change to use Java untar API on Windows from branch-1-win to trunk. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441164 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 19:45:28 +00:00
Aaron Myers dcd27ff778 Merge trunk into HDFS-347 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1440579 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 18:32:00 +00:00