Todd Lipcon 302f1e96ce Merge trunk into branch. ... Branch will not build after this commit: need to implement new JournalManager interfaces in QuorumJournalManager in a follow-up. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1371518 13f79535-47bb-0310-9956-ffa450edef68		2012-08-09 22:29:36 +00:00
..
bin	YARN-1. Promote YARN to be a sub-project of Apache Hadoop.	2012-08-08 05:22:27 +00:00
conf	MAPREDUCE-4417. add support for encrypted shuffle (tucu)	2012-07-26 13:23:05 +00:00
docs	HADOOP-8586. Fixup a bunch of SPNEGO misspellings. Contributed by Eli Collins	2012-07-11 08:21:22 +00:00
java	Merge trunk into branch.	2012-08-09 22:29:36 +00:00
native	HADOOP-8368. Use CMake rather than autotools to build native code (ccccabe via tucu)	2012-06-11 18:34:40 +00:00
packages	HADOOP-8552. Conflict: Same security.log.file for multiple users. (kkambatl via tucu)	2012-07-16 17:28:49 +00:00
proto	Merge HDFS-3042 (automatic failover) to trunk.	2012-05-24 00:56:20 +00:00
resources	HADOOP-8626. Typo in default setting for hadoop.security.group.mapping.ldap.search.filter.user. Contributed by Jonathan Natkins.	2012-07-27 15:13:57 +00:00
webapps/static	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
xsl	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00