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

503 Commits

Author SHA1 Message Date
Karthik Kambatla de6faae97c YARN-5388. Deprecate and remove DockerContainerExecutor. (Daniel Templeton via kasha) 2016-10-25 13:35:47 -07:00
Akira Ajisaka dbd205762e HADOOP-13514. Upgrade maven surefire plugin to 2.19.1. Contributed by Ewan Higgs. 2016-10-25 15:55:55 +09:00
Benoy Antony 4bca385241 HADOOP-12082 Support multiple authentication schemes via AuthenticationFilter 2016-10-18 18:32:01 -07:00
Wei-Chiu Chuang ed9fcbec54 HADOOP-13661. Upgrade HTrace version. Contributed by Sean Mackrory. 2016-10-17 05:04:49 -07:00
Kai Zheng a57bba470b Merge branch 'trunk' into HADOOP-12756 2016-10-09 10:29:40 +08:00
Vinayakumar B 311954883f HDFS-10957. Retire BKJM from trunk (Vinayakumar B) 2016-10-06 19:28:25 +05:30
Kihwal Lee d6afcf364c HADOOP-13671. Fix ClassFormatException in trunk build. Contributed by Kihwal Lee. 2016-09-30 13:26:28 -05:00
Kai Zheng d1443988f8 Revert "HADOOP-13584. hdoop-aliyun: merge HADOOP-12756 branch back" 
This reverts commit 5707f88d85
 2016-09-29 09:18:27 +08:00
Kai Zheng 5707f88d85 HADOOP-13584. hdoop-aliyun: merge HADOOP-12756 branch back. 
HADOOP-12756 branch: Incorporate Aliyun OSS file system implementation. Contributors:
Mingfei Shi (mingfei.shi@intel.com)
Genmao Yu (genmao.ygm@alibaba-inc.com)
 2016-09-26 20:42:22 +08:00
Kai Zheng 60f66a9306 Merge branch 'trunk' into HADOOP-12756 2016-09-14 16:12:40 +08:00
Steve Loughran 7fdfcd8a6c HADOOP-13541 explicitly declare the Joda time version S3A depends on. Contributed by Stevel Loughran 2016-09-07 12:25:23 +01:00
Kai Zheng a5d5342228 HADOOP-12756. Incorporate Aliyun OSS file system implementation. Contributed by Mingfei Shi and Lin Zhou 2016-09-07 11:15:47 +08:00
Chris Nauroth 6f9c346e57 HADOOP-13446. Support running isolated unit tests separate from AWS integration tests. Contributed by Chris Nauroth. 2016-08-23 07:18:49 -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
Junping Du 0da69c324d YARN-4676. Automatic and Asynchronous Decommissioning Nodes Status Tracking. Contributed by Diniel Zhi. 
(cherry picked from commit d464483bf7)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNode.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
 2016-08-18 07:27:23 -07:00
Mingliang Liu 382d615260 HDFS-10678. Documenting NNThroughputBenchmark tool. (Contributed by Mingliang Liu) 2016-08-15 20:22:14 -07:00
Chris Nauroth b43de80031 HADOOP-13354. Update WASB driver to use the latest version (4.2.0) of SDK for Microsoft Azure Storage Clients. Contributed by Sivaguru Sankaridurg. 2016-07-27 15:50:38 -07:00
mattf-horton 12aa184479 HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in Hadoop and sub-projects, while adding it in to the only place it is still needed, hadoop-openstack. Contributed by Matt Foley. 2016-07-21 14:43:57 -07:00
Lei Xu 521f34317a HADOOP-12928. Update netty to 3.10.5.Final to sync with zookeeper. (lei) 2016-07-20 20:38:20 -07:00
Andrew Wang e340064013 HADOOP-13383. Update release notes for 3.0.0-alpha1. 2016-07-20 16:57:55 -07:00
Akira Ajisaka 7ddef0fee4 HDFS-10647. Add a link to HDFS disk balancer document in site.xml. Contributed by Yiqun Lin. 2016-07-19 14:46:07 -07:00
Andrew Wang da456ffd62 Preparing for 3.0.0-alpha2 development 2016-07-15 19:04:17 -07:00
Akira Ajisaka 7bd5d4272c HADOOP-13297. Add missing dependency in setting maven-remote-resource-plugin to fix builds. Contributed by Sean Busbey. 2016-07-11 17:21:56 -07:00
Vrushali 6d943038f6 Cleanup changes during rebase with trunk (Vrushali C) 2016-07-10 08:46:04 -07:00
Sangjin Lee 1a227744ac YARN-5070. upgrade HBase version for first merge (Vrushali C via sjlee) 2016-07-10 08:46:04 -07:00
Vrushali Channapattan 32b033d57c YARN-5052 Update timeline service v2 documentation to capture information about filters (Varun Saxena via Vrushali C) 2016-07-10 08:46:03 -07:00
Varun Saxena 8e09040381 YARN-5102. timeline service build fails with java 8. (Sangjin Lee via varunsaxena) 2016-07-10 08:45:58 -07:00
Varun Saxena bc6f978cd3 YARN-5045. hbase unit tests fail due to dependency issues. (Sangjin Lee via varunsaxena) 2016-07-10 08:45:58 -07:00
Sangjin Lee 6b445a5ccb YARN-3801. [JDK-8] Exclude jdk.tools from hbase-client and hbase-testing-util (Tsuyoshi Ozawa via sjlee) 
(cherry picked from commit a1bb9137af84a34bde799f45e7ab8a21e33d55e0)
 2016-07-10 08:45:38 -07:00
Sangjin Lee f668212529 YARN-3721. build is broken on YARN-2928 branch due to possible dependency cycle (Li Lu via sjlee) 
(cherry picked from commit a9738ceb17b50cce8844fd42bb800c7f83f15caf)
 2016-07-10 08:45:37 -07:00
Junping Du d275677e24 YARN-3634. TestMRTimelineEventHandling and TestApplication are broken. Contributed by Sangjin Lee. 
(cherry picked from commit b059dd4882fd759e4762cc11c019be4b68fb74c1)
 2016-07-10 08:45:36 -07:00
Zhijie Shen 51d092faef YARN-3529. Added mini HBase cluster and Phoenix support to timeline service v2 unit tests. Contributed by Li Lu. 2016-07-10 08:45:36 -07:00
Junping Du 4f0c7eaff3 YARN-3240. Implement client API to put generic entities. Contributed by Zhijie Shen 
(cherry picked from commit 4487da249f448d5c67b712cd0aa723e764eed77d)
 2016-07-10 08:45:29 -07:00
Zhijie Shen 0d2da08f35 YARN-3063. Bootstrapping TimelineServer next generation module. Contributed by Zhijie Shen. 
(cherry picked from commit fe7d0e7c8fc88e0721b18e1531b0899d9dbed296)
 2016-07-10 08:45:28 -07:00
Tsuyoshi Ozawa 0185de0767 HADOOP-11993. maven enforcer plugin to ban java 8 incompatible dependencies. (ozawa) 2016-07-08 05:40:52 +09:00
Tsuyoshi Ozawa 4009fa3a92 HADOOP-12064. [JDK8] Update guice version to 4.0. (ozawa) 2016-07-01 11:21:36 -07:00
Tsuyoshi Ozawa 5d58858bb6 HADOOP-9613. [JDK8] Update jersey version to latest 1.x release. 2016-06-21 08:05:32 +09:00
Akira Ajisaka 098ae11e35 HADOOP-12893. Verify LICENSE.txt and NOTICE.txt. Contributed by Xiao Chen, Andrew Wang, and Akira Ajisaka. 2016-06-15 13:30:14 +09:00
Akira Ajisaka ee55b74fb9 Revert "HADOOP-12893. Verify LICENSE.txt and NOTICE.txt. Contributed by Xiao Chen, Akira Ajisaka, and Andrew Wang." 
This reverts commit e383b732c5.
 2016-06-14 14:26:52 +09:00
Chris Nauroth 9581fb715c HADOOP-12666. Support Microsoft Azure Data Lake - as a file system in Hadoop. Contributed by Vishwajeet Dusane. 2016-06-09 14:33:31 -07:00
Andrew Wang e383b732c5 HADOOP-12893. Verify LICENSE.txt and NOTICE.txt. Contributed by Xiao Chen, Akira Ajisaka, and Andrew Wang. 2016-06-09 13:54:14 -07:00
Andrew Wang 58c3486850 HADOOP-13175. Remove hadoop-ant from hadoop-tools. Contributed by Chris Douglas. 2016-06-09 13:49:52 -07:00
Steve Loughran 31ffaf76f2 HADOOP-12537 S3A to support Amazon STS temporary credentials. Contributed by Sean Mackrory. 2016-06-09 21:00:47 +01: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
Steve Loughran c918286b17 HADOOP-13145 In DistCp, prevent unnecessary getFileStatus call when not preserving metadata. Contributed by Chris Nauroth. 2016-05-20 12:21:59 +01:00
Steve Loughran 22ff9e68d1 HADOOP-12767. Update apache httpclient version to 4.5.2; httpcore to 4.4.4. Artem Aliev via stevel. 2016-05-19 14:48:18 +01:00
Allen Wittenauer c7159f0240 HADOOP-13177. Native tests fail on OS X, because DYLD_LIBRARY_PATH is not defined to include libhadoop.dylib (Chris Nauroth via aw) 2016-05-19 06:25:22 -07:00
Andrew Wang 4b55642b9d HADOOP-11858. [JDK8] Set minimum version of Hadoop 3 to JDK 8. Contributed by Robert Kanter. 2016-05-16 15:45:39 -07:00
Li Lu 3fa1380c22 HADOOP-13083. The number of javadocs warnings is limited to 100. (Gergely Novák via gtcarrera9) 2016-05-13 13:44:35 -07: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
Arun Suresh cab9cbaa0a YARN-4468. Document the general ReservationSystem functionality, and the REST API. (subru and carlo via asuresh) 2016-04-15 16:58:49 -07:00
Junping Du f291d82cd4 YARN-4545. Allow YARN distributed shell to use ATS v1.5 APIs. Li Lu via junping_du 2016-03-14 08:28:38 -07:00
Masatake Iwasaki cbd31328a6 HADOOP-12470. In-page TOC of documentation should be automatically generated by doxia macro (iwasakims) 2016-03-04 14:11:36 +09:00
Robert Kanter 8eee59ce6b MAPREDUCE-6627. Add machine-readable output to mapred job -history command (rkanter) 2016-02-18 17:58:26 -08:00
cnauroth 8ab7658025 HADOOP-11031. Design Document for Credential Provider API. Contributed by Larry McCay. 2016-02-18 14:06:38 -08:00
Jian He dea90c9a86 YARN-4653. Document YARN security model from the perspective of Application Developers. Contributed by Steve Loughran 2016-02-14 17:13:15 +08:00
Steve Loughran 29ae258013 HADOOP-12292. Make use of DeleteObjects optional. (Thomas Demoor via stevel) 2016-02-06 15:05:16 +00:00
Vinayakumar B a6728a013e HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B) 2016-02-04 13:37:51 +05:30
Sangjin Lee 4dc0a39493 HADOOP-12761. incremental maven build is not really incremental (sjlee) 2016-02-03 08:58:49 -08:00
Akira Ajisaka 2ac39ca762 HADOOP-7161. Remove unnecessary oro package from dependency management section. Contributed by Sean Busbey. 2016-01-22 02:45:22 +09:00
Sangjin Lee f6f16118d3 MAPREDUCE-6577. MR AM unable to load native library without MR_AM_ADMIN_USER_ENV set (sjlee) 2016-01-05 15:22:50 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 70c26703f4 HADOOP-12577. Bumped up commons-collections version to 3.2.2 to address a security flaw. Contributed by Wei-Chiu Chuang. 2015-11-23 09:59:50 -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
Haohui Mai 65f53f246a HDFS-9168. Move client side unit test to hadoop-hdfs-client. Contributed by Haohui Mai. 2015-10-28 15:54:37 -07: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
Robert Kanter 0c4af0f998 MAPREDUCE-6495. Docs for archive-logs tool (rkanter) 2015-10-20 17:34:34 -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
Tsuyoshi Ozawa 33fefa33e5 HADOOP-11515. Upgrade jsch lib to jsch-0.1.51 to avoid problems running on java7. (stevel and ozawa) 2015-10-14 05:31:43 +09:00
Allen Wittenauer b59e434116 HADOOP-10949. metrics2 sink plugin for Apache Kafka (Babak Behzad via aw) 2015-10-05 14:02:07 -07:00
Zhe Zhang 8fd5520246 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirStatAndListingOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFS.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

Change-Id: Ic7946c4ea35bed587fe879ce58b959b25ecc0823
 2015-09-29 01:39:16 -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
Zhe Zhang 1080c37300 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.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/server/namenode/Namesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java

Change-Id: I8511c4d64b0959e79129febc179845a3892fedcc
 2015-09-22 13:27:09 -07:00
Andrew Wang c2ebab67ac HDFS-7351. Document the HDFS Erasure Coding feature. Contributed by Uma Maheswara Rao G and Zhe Zhang. 2015-09-15 10:16:45 -07:00
Karthik Kambatla 119cc75e7e MAPREDUCE-6415. Create a tool to combine aggregated logs into HAR files. (Robert Kanter via kasha) 2015-09-09 17:45:19 -07:00
Andrew Wang 0eb9b19325 HADOOP-12369. Point hadoop-project/pom.xml java.security.krb5.conf within target folder. 2015-09-01 10:57:32 -07:00
Tsuyoshi Ozawa faa38e1aa4 YARN-2801. Add documentation for node labels feature. Contributed by Wangda Tan and Naganarasimha G R. 2015-09-01 17:54:49 +09:00
Andrew Wang 90fe7bcc3b HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. Contributed by Charlie Helin. 2015-08-27 10:17:00 -07:00
Lei Xu d5403747b5 HADOOP-12269. Update aws-sdk dependency to 1.10.6 (Thomas Demoor via Lei (Eddy) Xu) 2015-08-04 18:51:52 -07:00
Tsuyoshi Ozawa f02dd146f5 YARN-3174. Consolidate the NodeManager and NodeManagerRestart documentation into one. Contributed by Masatake Iwasaki. 2015-07-16 15:22:30 +09:00
cnauroth 0a16ee6017 HADOOP-12232. Upgrade Tomcat dependency to 6.0.44. Contributed by Chris Nauroth. 2015-07-14 15:22:33 -07:00
Chris Douglas 559425dcb9 HADOOP-5732. Add SFTPFileSystem. Contributed by Ramtin Boustani and Inigo Goiri 2015-07-07 10:08:59 -07:00
Arpit Agarwal 5dbc8c9cb0 HDFS-7164. Feature documentation for HDFS-6581. (Contributed by Arpit Agarwal) 2015-06-16 19:05:44 -07:00
cnauroth 94e7d49a6d HADOOP-11959. WASB should configure client side socket timeout in storage client blob request options. Contributed by Ivan Mitic. 2015-05-28 12:31:06 -07:00
Colin Patrick Mccabe a1140959da HADOOP-11894. Bump the version of Apache HTrace to 3.2.0-incubating (Masatake Iwasaki via Colin P. McCabe) 2015-05-28 12:00:55 -07:00
Haohui Mai ada233b7cd HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang. 2015-05-24 22:30:32 -07:00
Akira Ajisaka ab7958f227 HADOOP-11594. Improve the readability of site index of documentation. Contributed by Masatake Iwasaki. 2015-05-22 16:51:05 +09:00
Akira Ajisaka a5def58087 YARN-3694. Fix dead link for TimelineServer REST API. Contributed by Jagadesh Kiran N. 2015-05-21 23:14:44 +09:00
Haohui Mai ce53c8eb0c HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni. 2015-05-19 18:28:20 -07:00
Zhijie Shen fcd0702c10 YARN-3539. Updated timeline server documentation and marked REST APIs evolving. Contributed by Steve Loughran. 2015-05-12 21:13:22 -07:00
Xiaoyu Yao e8f66c449c HADOOP-11942. Add links to SLGUserGuide to site index (Masatake Iwasaki via xyao) 2015-05-08 14:34:34 -07:00
Tsuyoshi Ozawa b419c1b2ec YARN-3169. Drop YARN's overview document. Contributed by Brahma Reddy Battula. 2015-05-08 19:58:33 +09:00
Jonathan Eagles 2d7363b273 HADOOP-11889. Make checkstyle runnable from root project (Gera Shegalov via jeagles) 2015-05-01 13:11:50 -05:00
Tsuyoshi Ozawa 174d8b3a10 HADOOP-11811. Fix typos in hadoop-project/pom.xml. Contributed by Brahma Reddy Battula. 2015-04-13 06:59:51 -05:00
Owen O'Malley ce63573314 HADOOP-11717. Support JWT tokens for web single sign on to the Hadoop 
servers. (Larry McCay via omalley)
 2015-04-07 08:09:41 -07:00
Vinod Kumar Vavilapalli 4b3948ea36 HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. Contributed by Li Lu. 2015-04-04 13:52:01 -07:00
Haohui Mai 16b74f978a HDFS-7893. Update the POM to create a separate hdfs-client jar. Contributed by Haohui Mai. 2015-04-02 15:29:18 -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
Tsuyoshi Ozawa 522c897146 HADOOP-11729. Fix link to cgroups doc in site.xml. Contributed by Masatake Iwasaki. 2015-03-19 23:08:18 +09:00
Xuan 06ce1d9a6c YARN-3338. Exclude jline dependency from YARN. Contributed by Zhijie 
Shen
 2015-03-12 10:25:00 -07:00
cnauroth 608ebd52ba HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. Contributed by Shashank Khandelwal and Ivan Mitic. 2015-03-06 15:25:01 -08:00
Jian He 1c03376300 YARN-1514. Utility to benchmark ZKRMStateStore#loadState for RM HA. Contributed by Tsuyoshi OZAWA 2015-02-18 16:06:55 -08:00
Allen Wittenauer b6fc1f3e43 HADOOP-11593. Convert site documentation from apt to markdown (stragglers) (Masatake Iwasaki via aw) 2015-02-17 21:30:24 -10:00
Allen Wittenauer 7eeca90daa HADOOP-11559. Add links to RackAwareness and InterfaceClassification to site index (Masatake Iwasaki via aw) 2015-02-10 17:06:03 -08: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
Karthik Kambatla 55235d28c3 HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha) 2015-02-04 13:05:11 -08: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
Allen Wittenauer 12e883007c MAPREDUCE-6151. Update document of GridMix (Masatake Iwasaki via aw) 2015-01-30 11:08:20 -08:00
Allen Wittenauer 3f982c5c26 MAPREDUCE-6150. Update document of Rumen (Masatake Iwasaki via aw) 2015-01-29 14:17:44 -08:00
Akira Ajisaka 57b8950f37 HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka) 2015-01-30 01:47:59 +09:00
Tsuyoshi Ozawa 20a4768397 HADOOP-11317. Increment SLF4J version to 1.7.10. Contributed by Tim Robertson. 2015-01-28 21:55:09 +09:00
Allen Wittenauer fcf1058b45 HADOOP-11008. Remove duplicated description about proxy-user in site documents (Masatake Iwasaki via aw) 2015-01-22 14:30:21 -08:00
Jian He 27a489cba6 YARN-2956. Added missing links in YARN documentation. Contributed by Masatake Iwasaki 2015-01-09 17:46:36 -08:00
arp c1f857b0b4 HADOOP-11395. Add site documentation for Azure Storage FileSystem integration. (Contributed by Chris Nauroth) 2014-12-19 18:54:22 -08:00
Junping Du 389f881d42 YARN-2949. Add documentation for CGroups. (Contributed by Varun Vasudev) 2014-12-18 06:25:59 -08:00
Haohui Mai 316613bdae HADOOP-11420. Use latest maven-site-plugin and replace link to svn with link to git. Contributed by Hervé Boutemy. 2014-12-17 14:05:53 -08:00
cnauroth cbfb996fb4 HADOOP-11396. Provide navigation in the site documentation linking to the Hadoop Compatible File Systems. Contributed by Chris Nauroth. 2014-12-12 23:32:37 -08:00
Haohui Mai b55769369b HADOOP-10476. Bumping the findbugs version to 3.0.0. Contributed by Haohui Mai. 2014-12-09 10:38:24 -08:00
Steve Loughran 394c70c21d HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. 2014-12-09 11:05:16 +00:00
Steve Loughran 144da2e465 HADOOP-10530 Make hadoop build on Java7+ only (stevel) 2014-12-08 15:31:00 +00:00
Ravi Prakash 53f64ee516 YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN 2014-11-11 21:28:11 -08:00
Jason Lowe 1e215e8ba2 YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli 2014-11-07 23:40:22 +00: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
Haohui Mai 35d353e0f6 HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-11-03 15:10:22 -08:00
Haohui Mai 80bb7d4794 HDFS-7319. Remove dead link to HFTP documentation from index.xml. Contributed by Masatake Iwasaki. 2014-10-31 16:54:59 -07:00
Haohui Mai 675bca2968 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:53:53 -07:00
Steve Loughran 6a326711aa YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 13:02:25 -07:00
Kihwal Lee 99d7a452be HADOOP-11007. Reinstate building of ant tasks support. Contributed by 
Jason Lowe.
 2014-10-07 16:20:16 -05: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
Jing Zhao b014e83bc5 HDFS-6864. Archival Storage: add user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-09-17 09:40:17 -07:00
Alejandro Abdelnur 3e85f5b605 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:36:07 -07:00
Alejandro Abdelnur 932ae036ac HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:05:42 -07:00
Aaron T. Myers 24d920b80e HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:27:07 -07:00
Colin Patrick Mccabe 5ec7fcd9dd HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) 2014-09-10 16:14:53 -07:00
Steve Loughran 59384dfb71 HADOOP-10373 create tools/hadoop-amazon for aws/EMR support 2014-09-02 20:11:13 +01:00
Karthik Kambatla 9ad413b19d HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) 2014-08-29 15:56:45 -07:00
Alejandro Abdelnur b1dce2aa21 HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) 2014-08-29 11:53:22 -07:00
Alejandro Abdelnur 156e6a4f8a HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) 2014-08-29 11:23:23 -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
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
Allen Wittenauer b8ea45c2e3 YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618066 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 21:45:58 +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 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
Andrew Wang 311d2f0773 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:26:52 +00:00
Arpit Agarwal b98400df7b HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616575 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 19:42:09 +00:00
Andrew Wang ac47ad11de HDFS-6394. HDFS encryption documentation. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616016 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:49:31 +00:00
Andrew Wang ac73d416f3 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:30:54 +00:00
Steve Loughran 9b2bfc7c28 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA -pom indentation 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614673 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:49:06 +00:00
Steve Loughran f6436c0720 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614663 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:05:59 +00:00
Andrew Wang 22ba00de60 Merge from trunk to branch pt 2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612941 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 20:45:10 +00:00
Arpit Agarwal fee737eced HDFS-6712. Document HDFS Multihoming Settings. (Contributed by Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612695 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 20:28:57 +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
Steve Loughran ce0d636cce HADOOP-10801 dead link in site.xml 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609094 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-09 10:57:10 +00:00
Uma Maheswara Rao G cddd6184ad HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608781 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:50:49 +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
Steve Loughran 6cb273c9bc HADOOP-9361: site and gitignore 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607601 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 12:13:28 +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
Alejandro Abdelnur cebf3c6eec HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603643 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 21:47:40 +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 ab54276440 HADOOP-6350. Document Hadoop Metrics. (Contributed by Akira Ajisaka) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602324 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 02:56:14 +00:00
Chris Nauroth 81bc395deb HADOOP-9629. Support Windows Azure Storage - Blob as a file system in Hadoop. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601781 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 22:26:45 +00:00
Chris Nauroth 50b0653e1e HADOOP-9555. HA functionality that uses ZooKeeper may experience inadvertent TCP RST and miss session expiration event due to bug in client connection management. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601709 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 17:59:53 +00:00
Uma Maheswara Rao G ac23a55547 Merge HDFS-2006 HDFS XAttrs branch to Trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596575 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-21 13:57:33 +00:00
Ravi Prakash c9377189a0 MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595265 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 16:50:58 +00:00
Jonathan Turner Eagles 7fe28fc8f9 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592795 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:17:16 +00:00
Jonathan Turner Eagles bd54137afa MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592789 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:01:21 +00:00
Alejandro Abdelnur 17d4fbbf0a HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592637 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-05 21:43:14 +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
Vinod Kumar Vavilapalli ef498235ad YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1591416 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-30 18:00:32 +00:00
Jonathan Turner Eagles 693025a3d4 MAPREDUCE-5638. Port Hadoop Archives document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1591107 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 21:23:50 +00:00
Jonathan Turner Eagles a059eadbe9 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1590058 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 15:23:42 +00:00
Chris Nauroth 7bd5718594 HADOOP-10503. Move junit up to v 4.11. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589273 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-22 19:47:53 +00:00
Steve Loughran b8f250a99d HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585932 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 11:11:20 +00:00
Jian He 72051fc52c YARN-1017. Added documentation for ResourceManager Restart. (jianhe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582913 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 23:36:30 +00:00
Vinod Kumar Vavilapalli dce1d20383 YARN-1452. Added documentation about the configuration and usage of generic application history and the timeline data service. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581656 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 02:52:58 +00:00
Tsz-wo Sze 2fbd94db3e HDFS-6138. Add a user guide for how to use viewfs with federation. Contributed by sanjay and szetszwo 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580013 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-21 18:47:30 +00:00
Tsz-wo Sze 8c4d8058d8 HDFS-5778. Add rolling upgrade user document. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571508 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 01:14:12 +00:00
Zhijie Shen 23b2e43f5d YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565868 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-08 02:15:46 +00:00
Arpit Agarwal 87166f1ee8 HADOOP-9830. Fix typo at http://hadoop.apache.org/docs/current/ (Contributed by Kousuke Saruta) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561951 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 06:41:03 +00:00
Arpit Agarwal 0be0174669 HADOOP-10086. User document for authentication in secure cluster. (Contributed by Masatake Iwasaki) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561776 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-27 18:32:52 +00:00
Konstantin Boudnik 4c197b5d56 HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560831 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-23 22:29:23 +00:00
Alejandro Abdelnur cdc54c8759 HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559230 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-17 19:30:27 +00:00
Vinod Kumar Vavilapalli 7c8b654ba5 YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557801 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-13 18:34:02 +00:00
Steve Loughran 75d882ba00 HADOOP-10147 HDFS-5678 Upgrade to commons-logging 1.1.3 to avoid potential deadlock in MiniDFSCluster 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554803 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-02 13:39:37 +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 af367d1409 HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib dependency 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551916 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-18 11:16:57 +00:00
Steve Loughran 59a2139093 HADOOP-10102. Update commons IO from 2.1 to 2.4 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547759 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-04 10:49:51 +00:00
Steve Loughran 0aa088e336 HADOOP-10103 commons-lang->2.6 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544174 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-21 13:39:23 +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 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
Colin McCabe ab33d54fe3 HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539253 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-06 07:57:01 +00:00