Andrew Wang 97583dbb0a Merge from trunk to branch ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1603993 13f79535-47bb-0310-9956-ffa450edef68		2014-06-19 18:32:13 +00:00
..
ant/org/apache/hadoop/ant
contrib	HDFS-6419. TestBookKeeperHACheckpoints.TestSBNCheckpoints fails on trunk. Contributed by Akira AJISAKA.	2014-05-20 18:13:01 +00:00
main	Merge from trunk to branch	2014-06-19 18:32:13 +00:00
site	HDFS-6559. Fix wrong option "dfsadmin -rollingUpgrade start" in the document. (Contributed by Akira Ajisaka)	2014-06-18 21:29:39 +00:00
test	Merge from trunk to branch	2014-06-19 18:32:13 +00:00
CMakeLists.txt	HDFS-6287. Add vecsum test of libhdfs read access times (cmccabe)	2014-05-15 00:29:41 +00:00
config.h.cmake	HDFS-6287. Add vecsum test of libhdfs read access times (cmccabe)	2014-05-15 00:29:41 +00:00