Commit Graph

2361 Commits

Author SHA1 Message Date
arp
31bbeaf383 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-06 12:28:22 -07:00
Alejandro Abdelnur
0f3c19c1bb HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu) 2014-09-05 21:59:12 -07:00
Alejandro Abdelnur
71c8d735f5 HADOOP-11070. Create MiniKMS for testing. (tucu) 2014-09-05 21:59:12 -07:00
arp
339d21f273 Merge trunk into HDFS-6581
Conflicts:
	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/NameNodeLayoutVersion.java
2014-09-05 21:36:25 -07:00
arp
21c0cdeec1 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 14:29:57 -07:00
Karthik Kambatla
0571b4561b HADOOP-11065. Rat check should exclude **/build/**. (kasha) 2014-09-05 13:09:10 -07:00
Allen Wittenauer
7a62515c86 HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw) 2014-09-05 11:31:49 -07:00
arp
71269f7097 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 11:14:10 -07:00
cnauroth
b44b2ee4ad HADOOP-11063. KMS cannot deploy on Windows, because class names are too long. Contributed by Chris Nauroth. 2014-09-04 11:47:18 -07:00
Alejandro Abdelnur
b69a48c988 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) 2014-09-04 09:22:00 -07:00
Alejandro Abdelnur
70b218748b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:11:10 -07:00
Alejandro Abdelnur
41f1662d46 HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) 2014-09-04 09:09:39 -07:00
Colin Patrick Mccabe
8f1a668575 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. 2014-09-03 19:35:39 -07:00
Alejandro Abdelnur
d9a03e272a HADOOP-10863. KMS should have a blacklist for decrypting EEKs. (asuresh via tucu) 2014-09-03 15:08:55 -07:00
arp
08a8f2be81 Merge trunk into HDFS-6581 2014-09-03 10:53:37 -07:00
Karthik Kambatla
ce0462129f HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -07:00
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Allen Wittenauer
0340206a29 HADOOP-11033. shell scripts ignore JAVA_HOME on OS X. (aw) 2014-09-02 14:44:47 -07:00
Andrew Wang
a0ccf83dfd HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. 2014-09-02 14:22:20 -07:00
Steve Loughran
6595e92b64 Fix hadoop-common-project/hadoop-common/src/main/native/README to current mail list and URL 2014-09-02 20:29:38 +01:00
Steve Loughran
59384dfb71 HADOOP-10373 create tools/hadoop-amazon for aws/EMR support 2014-09-02 20:11:13 +01:00
Allen Wittenauer
e06d2e3c98 HADOOP-11041. VersionInfo specifies subversion (Tsuyoshi OZAWA via aw) 2014-09-02 12:02:45 -07:00
Brandon Li
329b65958f Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk 2014-09-02 11:27:52 -07:00
Brandon Li
bad5f38d47 HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li 2014-09-02 11:27:28 -07:00
Jason Lowe
01e8f056d9 HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne 2014-09-02 18:15:38 +00:00
Allen Wittenauer
e1109fb656 HADOOP-11036. Add build directory to .gitignore (Tsuyoshi OZAWA via aw) 2014-09-02 10:10:06 -07:00
arp
217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -07:00
Benoy Antony
258c7d0f53 HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) 2014-08-30 12:49:19 -07: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
Andrew Wang
93010faf10 Add CHANGES.txt for HADOOP-11021. 2014-08-29 14:56:01 -07:00
Alejandro Abdelnur
c60da4d3b3 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) 2014-08-29 14:21:58 -07:00
arp
f65183eba3 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
2014-08-29 13:37:17 -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
arp
7e32be8768 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-08-28 19:06:46 -07:00
Alejandro Abdelnur
2ca93d1fbf Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-08-28 19:05:57 -07:00
Alejandro Abdelnur
bc6ce2cb34 Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release 2014-08-28 19:05:57 -07:00
Alejandro Abdelnur
6bf16d1156 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 19:05:57 -07:00
Allen Wittenauer
d8774cc577 HADOOP-11013. CLASSPATH handling should be consolidated, debuggable (aw) 2014-08-28 18:09:25 -07:00
Andrew Wang
7119bd49c8 HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. 2014-08-28 17:40:55 -07:00
Todd Lipcon
ab638e77b8 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. 2014-08-28 16:44:09 -07:00
arp
bbaa7dc28d HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 2014-08-28 15:53:12 -07:00
Alejandro Abdelnur
d9a7404c38 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-08-28 15:10:59 -07:00
Alejandro Abdelnur
88c5e2141c Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release 2014-08-28 15:07:57 -07:00
Alejandro Abdelnur
d1ae479aa5 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:45:40 -07:00
arp
722cc92fa5 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-08-28 11:09:06 -07:00
Karthik Kambatla
c4c9a78411 HADOOP-11001. Fix test-patch to work with the git repo. (kasha) 2014-08-27 23:12:57 -07:00
arp
a7bcc95358 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
Colin Patrick Mccabe
7a16731191 HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 2014-08-27 19:47:10 -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
Colin Patrick Mccabe
225569ece2 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 2014-08-27 13:39:40 -07:00
Haohui Mai
fdd3bc5f45 HADOOP-10746. HttpServer2 should not load JspServlet. Contributed by Haohui Mai. 2014-08-27 13:26:25 -07:00
brandonli
cd9182d8b5 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li 2014-08-27 11:06:01 -07:00
Allen Wittenauer
9ec4a930f5 HADOOP-10996. Stop violence in the *_HOME (aw) 2014-08-27 07:00:31 -07:00
Allen Wittenauer
a1618a2a77 HADOOP-11002. shell escapes are incompatible with previous releases (aw) 2014-08-27 06:56:59 -07:00
Karthik Kambatla
dc154ab86d Add a section for 2.5.1 in CHANGES.txt 2014-08-27 00:55:19 -07:00
Arpit Agarwal
4b3a6b8722 HADOOP-10282. Create a FairCallQueue: a multi-level call queue which schedules incoming calls and multiplexes outgoing calls. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619938 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 22:16:15 +00:00
Allen Wittenauer
10d267975c HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619887 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 18:25:09 +00:00
Chris Nauroth
b6c24472f3 HADOOP-10989. Work around buggy getgrouplist() implementations on Linux that return 0 on failure. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619659 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 04:05:18 +00:00
Allen Wittenauer
7be2808347 HADOOP-8896. Javadoc points to Wrong Reader and Writer classes in SequenceFile (Ray Chiang via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619632 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:58:25 +00:00
Jason Darrell Lowe
da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:38:16 +00:00
Alejandro Abdelnur
ddb7f12ef9 HADOOP-10992. Merge KMS to branch-2, updating hadoop-common CHANGES.txt. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619556 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:03:28 +00:00
Karthik Kambatla
9b8250c742 Set the release date for 2.5.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619237 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 21:33:19 +00:00
Andrew Wang
b0f0ef17f0 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619203 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:56:56 +00:00
Andrew Wang
d2a39b61aa Merge from trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 01:22:42 +00:00
Charles Lamb
a4ee77b65f HDFS-6873. Constants in CommandWithDestination should be static. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618975 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 20:43:54 +00:00
Colin McCabe
bf9aa34dea HADOOP-10968. hadoop native build fails to detect java_libarch on ppc64le (Dinar Valeev via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618919 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 18:10:00 +00:00
Allen Wittenauer
31467453ec HADOOP-9902. Shell script rewrite (aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618847 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 12:11:17 +00:00
Allen Wittenauer
379292aa97 HADOOP-10873. Fix dead link in Configuration javadoc (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618721 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:05:08 +00:00
Allen Wittenauer
4129a6e093 HADOOP-10972. Native Libraries Guide contains mis-spelt build line (Peter Klavins via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618719 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:00:56 +00: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
Todd Lipcon
55d7fecd09 Update CHANGES.txt for HDFS-6561 which was renamed to HADOOP-10975.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618686 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:09:38 +00:00
Arpit Agarwal
110cf46a07 HADOOP-10973. Native Libraries Guide contains format error. (Contributed by Peter Klavins)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618682 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:05:36 +00:00
Colin McCabe
e446497cd1 HDFS-6561. org.apache.hadoop.util.DataChecksum should support native checksumming (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618680 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:02:37 +00:00
Jason Darrell Lowe
4a978bff3e HADOOP-10059. RPC authentication and authorization metrics overflow to negative values on busy clusters. Contributed by Tsuyoshi OZAWA and Akira AJISAKA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618659 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 16:31:38 +00:00
Arpit Agarwal
86840834ed HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618503 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 19:02:45 +00:00
Arpit Agarwal
48505679c0 HADOOP-10335. Undo checkin to resolve test build issue.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618487 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:47:18 +00:00
Arpit Agarwal
b47ad1ccba HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618484 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:43:20 +00:00
Arpit Agarwal
c1cd41cc49 HADOOP-10650. Add ability to specify a reverse ACL (black list) of users and groups. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618482 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 17:06:01 +00:00
Allen Wittenauer
31e478905a Wrong categorization for a variety of commits in the CHANGES.txt files
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 16:47:34 +00:00
Alejandro Abdelnur
e932365d6d HADOOP-10698. KMS, add proxyuser support. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618217 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 15:53:28 +00:00
Andrew Wang
16b7bd4e6c Move HADOOP-10121 to correct section of CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618105 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 05:53:03 +00:00
Andrew Wang
cfeaf4cd09 HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618103 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 05:50:00 +00:00
Alejandro Abdelnur
be117cbcdf HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618101 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 05:45:14 +00:00
Alejandro Abdelnur
e86c9ef651 HADOOP-10770. KMS add delegation token support. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618096 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 05:03:58 +00:00
Allen Wittenauer
597b3fdc92 HADOOP-10231. Add some components in Native Libraries document (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618059 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 21:39:49 +00:00
Allen Wittenauer
399e428deb HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618044 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 20:28:36 +00:00
Todd Lipcon
bd79a4b926 HADOOP-10838. Byte array native checksumming. Contributed by James Thomas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617875 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 04:29:35 +00:00
Colin McCabe
e90d940699 HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617860 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 01:36:12 +00:00
Arpit Agarwal
2f3ed504c1 HADOOP-10966. Hadoop Common native compilation broken in windows. (Contributed by David Villegas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617823 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 20:01:21 +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
Allen Wittenauer
cc93c1fd75 MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617804 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:18:50 +00:00
Allen Wittenauer
6ab25dfcd9 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) (continued)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617802 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 19:10:24 +00:00
Allen Wittenauer
a34dafe325 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617775 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 17:30:26 +00:00
Arpit Agarwal
e0a9e1bfb7 HADOOP-10281. Create a scheduler, which assigns schedulables a priority level. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617643 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 00:54:29 +00:00
Colin McCabe
f7ac928a7c HADOOP-10962. Flags for posix_fadvise are not valid in some architectures (David Villegas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617621 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 23:03:06 +00:00
Arpit Agarwal
d687f6f689 HADOOP-10851. NetgroupCache does not remove group memberships. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617612 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 22:30:48 +00:00
Andrew Wang
0a2ee2fd53 HADOOP-10820. Throw an exception in GenericOptionsParser when passed an empty Path. Contributed by Alex Holmes and Zhihai Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617542 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:46:31 +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
Charles Lamb
acc3d73a45 HDFS-6839. Fix TestCLI to expect new output. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617526 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 16:50:18 +00:00