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

300 Commits

Author SHA1 Message Date
Tsuyoshi Ozawa f95e3c3091 YARN-3174. Consolidate the NodeManager and NodeManagerRestart documentation into one. Contributed by Masatake Iwasaki. 
(cherry picked from commit f02dd146f5)
 2015-07-16 15:22:57 +09:00
cnauroth 5e8c01e7a2 HADOOP-12232. Upgrade Tomcat dependency to 6.0.44. Contributed by Chris Nauroth. 
(cherry picked from commit 6b56f05b9ea3ee45abd5d00b14fab93a353b1332)
 2015-07-14 15:22:39 -07:00
Chris Douglas 62424b5d99 HADOOP-5732. Add SFTPFileSystem. Contributed by Ramtin Boustani and Inigo Goiri 
(cherry picked from commit 559425dcb9)
 2015-07-07 10:09:29 -07:00
Arpit Agarwal acc90ca175 HDFS-7164. Feature documentation for HDFS-6581. (Contributed by Arpit Agarwal) 2015-06-16 19:06:39 -07:00
cnauroth 39f451e721 HADOOP-11959. WASB should configure client side socket timeout in storage client blob request options. Contributed by Ivan Mitic. 
(cherry picked from commit 94e7d49a6d)

Conflicts:
	hadoop-project/pom.xml
 2015-05-28 12:32:55 -07:00
Colin Patrick Mccabe 4b108a441d HADOOP-11894. Bump the version of Apache HTrace to 3.2.0-incubating (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit a1140959da)
 2015-05-28 12:03:07 -07:00
Haohui Mai f70b9d9241 HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang. 2015-05-24 22:30:50 -07:00
Akira Ajisaka b95d21c379 HADOOP-11594. Improve the readability of site index of documentation. Contributed by Masatake Iwasaki. 
(cherry picked from commit ab7958f227)
 2015-05-22 16:54:46 +09:00
Akira Ajisaka 6d7e7ef1c4 YARN-3694. Fix dead link for TimelineServer REST API. Contributed by Jagadesh Kiran N. 
(cherry picked from commit a5def58087)
 2015-05-21 23:15:17 +09:00
Haohui Mai ed320da2ba HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni. 2015-05-19 18:28:34 -07:00
Zhijie Shen 6043224458 YARN-3539. Updated timeline server documentation and marked REST APIs evolving. Contributed by Steve Loughran. 
(cherry picked from commit fcd0702c10)
 2015-05-12 21:13:47 -07:00
Tsuyoshi Ozawa 5ddc3adb0d YARN-3169. Drop YARN's overview document. Contributed by Brahma Reddy Battula. 
(cherry picked from commit b419c1b2ec)
 2015-05-08 19:58:47 +09:00
Jonathan Eagles 9ed6b77da1 HADOOP-11889. Make checkstyle runnable from root project (Gera Shegalov via jeagles) 
(cherry picked from commit 2d7363b273)

Conflicts:
	pom.xml
 2015-05-01 19:04:41 -07:00
Tsuyoshi Ozawa bc979ff3bf HADOOP-11811. Fix typos in hadoop-project/pom.xml. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 174d8b3a10)
 2015-04-13 07:00:33 -05:00
Owen O'Malley c16af2f6f8 HADOOP-11717. Support JWT tokens for web single sign on to the Hadoop 
servers. (Larry McCay via omalley)
 2015-04-07 08:17:10 -07:00
Vinod Kumar Vavilapalli 00854d2c2f HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. Contributed by Li Lu. 
(cherry picked from commit 4b3948ea36)
 2015-04-04 13:52:51 -07:00
Haohui Mai 1278310c21 HDFS-7893. Update the POM to create a separate hdfs-client jar. Contributed by Haohui Mai. 2015-04-02 15:39:40 -07:00
Tsuyoshi Ozawa 0eeb760c55 HADOOP-11729. Fix link to cgroups doc in site.xml. Contributed by Masatake Iwasaki. 
(cherry picked from commit 522c897146)
 2015-03-19 23:08:41 +09:00
Xuan 498d775c9b YARN-3338. Exclude jline dependency from YARN. Contributed by Zhijie 
Shen

(cherry picked from commit 06ce1d9a6c)
 2015-03-12 10:25:55 -07:00
Haohui Mai e75e6c66ea HADOOP-11633. Convert remaining branch-2 .apt.vm files to markdown. Contributed by Masatake Iwasaki. 2015-03-11 14:23:44 -07:00
Vinod Kumar Vavilapalli d9416317a9 Preparing for 2.8.0 development. Changing SNAPSHOT version to be 2.8 on branch-2. 2015-03-08 20:32:51 -07:00
cnauroth 02cadbd24b HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. Contributed by Shashank Khandelwal and Ivan Mitic. 
(cherry picked from commit 608ebd52ba)

Conflicts:
	hadoop-project/pom.xml
 2015-03-06 15:29:22 -08:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki. 
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-02-28 17:06:58 -08:00
Colin Patrick Mccabe 343cffb0ea HADOOP-11495. Backport "convert site documentation from apt to markdown" to branch-2 (Masatake Iwasaki via Colin P. McCabe) 
(cherry-picked from commit b6fc1f3e43)

Conflicts:
    hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/RackAwareness.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm
    hadoop-project/src/site/site.xml
 2015-02-24 15:48:58 -08:00
Jian He b8fe1a747e YARN-1514. Utility to benchmark ZKRMStateStore#loadState for RM HA. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit 1c03376300)
 2015-02-18 16:34:42 -08:00
Karthik Kambatla fcf3dc5977 HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha) 
(cherry picked from commit 55235d28c3)
 2015-02-04 14:00:44 -08:00
Colin Patrick Mccabe 80381b62aa HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 09ad9a868a)
 2015-01-30 16:02:36 -08:00
Allen Wittenauer a754f94ed7 MAPREDUCE-6151. Update document of GridMix (Masatake Iwasaki via aw) 2015-01-30 11:09:03 -08:00
Allen Wittenauer 3165e778f3 MAPREDUCE-6150. Update document of Rumen (Masatake Iwasaki via aw) 2015-01-29 14:18:25 -08:00
Akira Ajisaka 7411c74b11 HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka) 
(cherry picked from commit 57b8950f37)

Conflicts:
	pom.xml
 2015-01-30 02:27:36 +09:00
Tsuyoshi Ozawa 235a77fe1c HADOOP-11317. Increment SLF4J version to 1.7.10. Contributed by Tim Robertson. 
(cherry picked from commit 20a4768397)
 2015-01-28 21:55:33 +09:00
Allen Wittenauer 03ee9e344f HADOOP-11008. Remove duplicated description about proxy-user in site documents (Masatake Iwasaki via aw) 2015-01-22 14:30:35 -08:00
Jian He 68709cb9be YARN-2956. Added missing links in YARN documentation. Contributed by Masatake Iwasaki 
(cherry picked from commit 27a489cba6)
 2015-01-09 17:47:00 -08:00
arp 0a5b28605f HADOOP-11395. Add site documentation for Azure Storage FileSystem integration. (Contributed by Chris Nauroth) 2014-12-19 18:54:35 -08:00
Junping Du cec9300201 YARN-2949. Add documentation for CGroups. (Contributed by Varun Vasudev) 
(cherry picked from commit 389f881d42)
 2014-12-18 06:26:53 -08:00
Chris Nauroth 82268d87bc 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
(cherry picked from commit 81bc395deb)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml
	hadoop-tools/hadoop-tools-dist/pom.xml
	hadoop-tools/pom.xml
 2014-12-17 14:56:05 -08:00
Haohui Mai e869276005 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:59 -08:00
cnauroth b9f1e88df7 HADOOP-11396. Provide navigation in the site documentation linking to the Hadoop Compatible File Systems. Contributed by Chris Nauroth. 
(cherry picked from commit cbfb996fb4)
 2014-12-12 23:32:55 -08:00
Haohui Mai c9e9f82ec6 HADOOP-10476. Bumping the findbugs version to 3.0.0. Contributed by Haohui Mai. 2014-12-09 10:38:43 -08:00
Steve Loughran a7be36384a HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. 2014-12-09 11:04:59 +00:00
Steve Loughran 275561d848 HADOOP-10530 Make hadoop build on Java7+ only (stevel) 2014-12-08 15:30:34 +00:00
Ravi Prakash d863f54f57 YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN 2014-11-11 21:29:27 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Jason Lowe 9447235527 YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli 
(cherry picked from commit 1e215e8ba2)
 2014-11-07 23:41:29 +00:00
Haohui Mai aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Haohui Mai 3bdfd6e58e HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. 2014-11-04 10:52:22 -08:00
Haohui Mai d2d2c84a10 HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-11-03 15:10:37 -08:00
Haohui Mai bbdd990864 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:54:04 -07:00
Steve Loughran d218ab58fc YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 12:55:47 -07:00
Kihwal Lee 7910c6d035 HADOOP-11007. Reinstate building of ant tasks support. Contributed by 
Jason Lowe.
(cherry picked from commit 99d7a452be)
 2014-10-07 16:23:52 -05: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 897ced1a20 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 
(cherry picked from commit db890eef32)

Conflicts:
	hadoop-project/pom.xml
 2014-09-20 08:24:34 -07:00
Alejandro Abdelnur 5d897026e4 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:37:04 -07:00
Alejandro Abdelnur e59f6771e8 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:10:43 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
Colin Patrick Mccabe 5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) 
(cherry picked from commit 5ec7fcd9dd)
 2014-09-11 15:00:47 -07:00
Steve Loughran fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel) 
(cherry picked from commit 59384dfb71)
 2014-09-11 11:43:52 -07:00
Karthik Kambatla 05ae7983c6 HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) 
(cherry picked from commit 9ad413b19d)
 2014-08-29 15:57:29 -07:00
Alejandro Abdelnur 09a0ad328f HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) 
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
 2014-08-29 11:53:13 -07:00
Alejandro Abdelnur 54202383a9 HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) 
(cherry picked from commit 6040810df82669f140033d3c6366892640798671)

Conflicts:
	hadoop-project/pom.xml
 2014-08-29 11:23:14 -07: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
Alejandro Abdelnur 7a07873c28 HADOOP-10141. Create KeyProvider API to separate encryption key storage 
from the applications. (omalley)


Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619506 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:24 +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
Alejandro Abdelnur 481ac00c65 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/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:01:12 +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
Steve Loughran 432e5eef56 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/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:06:05 +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
Uma Maheswara Rao G 5b832979e1 Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:53:42 +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
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 06:11:57 +00:00
Alejandro Abdelnur 602d3dd926 HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603645 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 21:50:49 +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
Chris Nauroth 74a6db7b27 HADOOP-9555. Merging change r1601709 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 18:05:22 +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
Chris Nauroth 8296b7e3cc HADOOP-10503. Merging change r1589273 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589275 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-22 19:58:02 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 11:11:31 +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
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 04:41:01 +00:00
Zhijie Shen c9b6c3c36c YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi. 
svn merge --ignore-ancestry -c 1565868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-08 02:18:06 +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
Konstantin Boudnik f3136cd6b9 HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov. 
Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-23 22:31:27 +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
Alejandro Abdelnur b9623c6308 HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559231 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-17 19:31:01 +00:00