Commit Graph

56 Commits

Author SHA1 Message Date
Haohui Mai d2d2c84a10 HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-11-03 15:10:37 -08:00
Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk
Conflicts:
	hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
	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/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java
2014-09-26 04:47:25 +08:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki.
(cherry picked from commit 6962510f72)
2014-08-27 14:17:29 -07:00
Alejandro Abdelnur d637c71e4d HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:53 +00:00
Allen Wittenauer 178c37bd0d 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/branches/branch-2@1618069 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 21:48:27 +00:00
Allen Wittenauer 93e518be3a MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617807 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:36:08 +00:00
Arpit Agarwal 3f54884b46 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:46:14 +00:00
Karthik Kambatla 5817f7ce5b HADOOP-10821. Prepare the release notes for Hadoop 2.5.0. (Andrew Wang and Karthik Kambatla via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614232 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 00:47:57 +00:00
Arpit Agarwal 32e9ab8341 HDFS-6712: Merging r1612695 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612696 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 20:33:07 +00:00
Arpit Agarwal 73d109304d HADOOP-10864: Merging r1612609 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612610 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 16:57:48 +00:00
Steve Loughran 4a97dec701 HADOOP-10801 dead link in site.xml
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609093 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 10:56:32 +00:00
Steve Loughran 6441c4c626 HADOOP-9361: site and gitignore
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607626 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:56:17 +00:00
Arpit Agarwal e6d729c27c HADOOP-6350: Merging r1602324 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602325 13f79535-47bb-0310-9956-ffa450edef68
2014-06-13 02:56:47 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 19:25:17 +00:00
Ravi Prakash 2125caaa2f MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595268 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 17:11:01 +00:00
Jonathan Turner Eagles 7ac359f389 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592796 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:18:13 +00:00
Jonathan Turner Eagles 72feaf0436 MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592792 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 16:05:37 +00:00
Vinod Kumar Vavilapalli 0a914b61e0 YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1591416 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591417 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 18:01:05 +00:00
Jonathan Turner Eagles 73e0b8e55a MAPREDUCE-5638. Port Hadoop Archives document to trunk (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591108 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 21:27:14 +00:00
Jonathan Turner Eagles e0cd544a53 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590131 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 20:32:09 +00:00
Jian He ce4d860308 Merge r1582913 from trunk. YARN-1017. Added documentation for ResourceManager Restart.(jianhe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582917 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 23:41:44 +00:00
Vinod Kumar Vavilapalli 4c91a402f5 YARN-1452. Added documentation about the configuration and usage of generic application history and the timeline data service. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1581656 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581657 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 02:54:00 +00:00
Tsz-wo Sze e3acf75912 svn merge -c 1580013 from trunk for merging site.xml (missing from previous commit)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580018 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:50:57 +00:00
Jing Zhao 6aa3081681 HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 21:03:42 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Arpit Agarwal 152f1b17c6 HADOOP-9830. Merging r1561951 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561952 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 06:42:51 +00:00
Arpit Agarwal be32b2d1ad HADOOP-10086. Merging r1561776 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561777 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:36:07 +00:00
Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:43:00 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:20:35 +00:00
Jason Darrell Lowe 7e812e7126 svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:40:01 +00:00
Alejandro Abdelnur 75f9db1c4d YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
Arun Murthy a37125a531 Merge -c 1493693 from trunk to branch-2 to fix HADOOP-9517. Documented various aspects of compatibility for Apache Hadoop. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493694 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 09:33:14 +00:00
Arun Murthy 51bb83eabf Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 19:10:32 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:29:20 +00:00
Todd Lipcon 87a1e92453 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:02:57 +00:00
Thomas Graves ecfd15693e HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445648 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:05:21 +00:00
Alejandro Abdelnur f5503bd44a MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:53:06 +00:00
Alejandro Abdelnur 7194c52ec3 HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425527 13f79535-47bb-0310-9956-ffa450edef68
2012-12-23 21:15:42 +00:00
Todd Lipcon fd032dd9e3 Merge HDFS-3077 (QuorumJournalManager) backport into branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417596 13f79535-47bb-0310-9956-ffa450edef68
2012-12-05 19:22:17 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 13:57:19 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Eli Collins 3f1179c966 HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347134 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 21:14:55 +00:00
Thomas White a7e688c6a8 Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:22:53 +00:00
Suresh Srinivas 40276d7f78 HDFS-1623. Merging change r1296534 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299412 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 17:55:58 +00:00
Arun Murthy 736a8ed760 Merge -c 1296905 from trunk to branch-0.23 to fix HADOOP-8137. Added links to CLI manuals to the site.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296906 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 23:55:32 +00:00
Alejandro Abdelnur e98fdc037c Merge -r 1242986:1242987 from trunk to branch. FIXES: HADOOP-8051
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242988 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 00:04:08 +00:00
Mahadev Konar 43d921b0ad MAPREDUCE-3791. can't build site in hadoop-yarn-server-common. (mahadev) - Merging r1240587 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240588 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 18:45:17 +00:00
Mahadev Konar ccaba4ba7e MAPREDUCE-3737. The Web Application Proxy's is not documented very well. (Robert Evans via mahadev) - Merging r1236371 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236373 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 20:12:24 +00:00
Mahadev Konar 6b3f5b7bd2 MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) - Merging r1234222 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:55:16 +00:00