Commit Graph

1786 Commits

Author SHA1 Message Date
Andrew Wang
b7e67db372 HADOOP-10936. Change default KeyProvider bitlength to 128. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615850 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 02:32:44 +00:00
Andrew Wang
ac73d416f3 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 02:30:54 +00:00
Andrew Wang
513dc29ce8 HADOOP-10937. Need to set version name correctly before decrypting EEK. Contributed by Arun Suresh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615841 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 02:21:28 +00:00
Andrew Wang
c8abf5f20a HADOOP-10927. Fix CredentialShell help behavior and error codes. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615827 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 00:20:30 +00:00
Andrew Wang
d7b5709bcb HADOOP-10928. Incorrect usage on . Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615808 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 21:45:26 +00:00
Eric Yang
9ffc4b13c4 HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615700 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 17:37:43 +00:00
Uma Maheswara Rao G
10db613389 HADOOP-10886. CryptoCodec#getCodecclasses throws NPE when configurations not loaded. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615523 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 09:56:57 +00:00
Chris Nauroth
2ad6da01c3 HADOOP-10903. Enhance hadoop classpath command to expand wildcards or write classpath into jar manifest. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615386 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 04:58:42 +00:00
Chris Nauroth
c614ceed84 HADOOP-10925. Compilation fails in native link0 function on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615320 13f79535-47bb-0310-9956-ffa450edef68
2014-08-02 15:02:23 +00:00
Colin McCabe
1ba3f89714 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 20:41:05 +00:00
Andrew Wang
da2ce46fbe HDFS-6802. Some tests in TestDFSClientFailover are missing @Test annotation. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615183 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:58:14 +00:00
Andrew Wang
c4a3a29541 HADOOP-10793. KeyShell args should use single-dash style. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615180 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:45:45 +00:00
Andrew Wang
5918e99151 HADOOP-10900. CredentialShell args should use single-dash style. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615177 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:43:17 +00:00
Andrew Wang
0d66f1f19c HADOOP-10902. Deletion of directories with snapshots will not output reason for trash move failure. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615171 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:13:37 +00:00
Xuan Gong
e52f67e389 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik,and Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614981 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 20:06:02 +00:00
Arpit Agarwal
b8b8f3f5e7 HDFS-6441. Add ability to exclude/include specific datanodes while balancing. (Contributed by Benoy Antony and Yu Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614812 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 06:02:46 +00:00
Chris Nauroth
535fe14ded HDFS-6570. add api that enables checking if a user has certain permissions on a file. Contributed by Jitendra Pandey.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614723 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 17:49:09 +00:00
Andrew Wang
c3fa0b5884 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614553 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 06:09:33 +00:00
Andrew Wang
09e7ff05df HDFS-6778. The extended attributes javadoc should simply refer to the user docs. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614547 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 05:57:55 +00:00
Arpit Agarwal
260fd25568 HADOOP-8069. Enable TCP_NODELAY by default for IPC. (Contributed by Todd Lipcon)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614242 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 02:55:27 +00:00
Andrew Wang
c6cddce752 HADOOP-10876. The constructor of Path should not take an empty URL as a parameter. Contributed by Zhihai Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614230 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 00:44:12 +00:00
Charles Lamb
1d3e9ec935 merge from trunk r1613787
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613788 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 13:32:51 +00:00
Karthik Kambatla
9cfde45b45 HADOOP-10896. Update compatibility doc to capture visibility of un-annotated classes/ methods. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613543 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 00:48:42 +00:00
Andrew Wang
e670641bbf Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613334 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 23:55:15 +00:00
Andrew Wang
934ba441c1 HADOOP-10891. Add EncryptedKeyVersion factory method to KeyProviderCryptoExtension. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613332 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 23:49:22 +00:00
Arpit Agarwal
f2137d7c0e HADOOP-10894. Fix dead link in ToolRunner documentation. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613200 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 17:47:08 +00:00
Todd Lipcon
2054453a39 HADOOP-10882. Move DirectBufferPool into common util. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613006 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 06:22:02 +00:00
Andrew Wang
9bfae42538 HADOOP-10887. Add XAttrs to ViewFs and make XAttrs + ViewFileSystem internal dir behavior consistent. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612951 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 21:42:01 +00:00
Andrew Wang
22ba00de60 Merge from trunk to branch pt 2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612941 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 20:45:10 +00:00
Arpit Agarwal
b9370fdcf6 HADOOP-10890. TestDFVariations.testMount fails intermittently. (Contributed by Yongjun Zhang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612916 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 18:53:38 +00:00
Uma Maheswara Rao G
61156a8ae3 HADOOP-10830. Missing lock in JavaKeyStoreProvider.createCredentialEntry. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612904 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 18:12:55 +00:00
Arpit Agarwal
fa08b92f46 HADOOP-10872. TestPathData fails intermittently with 'Mkdirs failed to create d1'. (Contributed by Yongjun Zhang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612895 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 17:49:47 +00:00
Andrew Wang
e0f00e12ce HADOOP-10881. Clarify usage of encryption and encrypted encryption key in KeyProviderCryptoExtension. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612737 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 01:24:22 +00:00
Todd Lipcon
181c466436 HADOOP-10855. Allow Text to be read with a known Length. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612731 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 00:28:57 +00:00
Andrew Wang
c83c5b868e HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612625 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 17:47:49 +00:00
Arpit Agarwal
9c062e03d1 HADOOP-10864. Tool documentenation is broken. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612609 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 16:52:09 +00:00
Alejandro Abdelnur
ab6af79126 HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is thread-unsafe. (benoyantony viat tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612594 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 15:44:33 +00:00
Yi Liu
b52b80d7bd HADOOP-10853. Refactor get instance of CryptoCodec and support create via algorithm/mode/padding. (yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612513 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 08:38:38 +00:00
Colin McCabe
6fac3e9b61 HADOOP-10870. Failed to load OpenSSL cipher error logs on systems with old openssl versions (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612440 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 00:58:10 +00:00
Colin McCabe
a4984f5f0a HADOOP-10871. incorrect prototype in OpensslSecureRandom.c (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612436 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 23:56:53 +00:00
Colin McCabe
761d44f900 HADOOP-10866. RawLocalFileSystem fails to read symlink targets via the stat command when the format of the stat command uses non-curly quotes (yzhang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612428 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 23:21:27 +00:00
Andrew Wang
d3bf8186ae HADOOP-10755. Support negative caching of user-group mapping. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612408 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:52:17 +00:00
Andrew Wang
cb20bb6117 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:44:50 +00:00
Alejandro Abdelnur
0c1469ece3 HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey in the REST API. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612399 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 20:55:42 +00:00
Colin McCabe
87c632c995 HADOOP-10857. Native Libraries Guide does not mention a dependency on openssl-development package (ozawa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612384 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 19:05:08 +00:00
Alejandro Abdelnur
0a3ea6c486 HADOOP-10750. KMSKeyProviderCache should be in hadoop-common. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611823 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 22:01:18 +00:00
Alejandro Abdelnur
64ed72a047 HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611780 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 19:42:01 +00:00
Alejandro Abdelnur
f714413615 HADOOP-10842. CryptoExtension generateEncryptedKey method should receive the key name. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611542 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 06:13:17 +00:00
Alejandro Abdelnur
7f06998bf2 HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611540 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 05:40:35 +00:00
Aaron Myers
dae1b6cc2a HADOOP-10610. Upgrade S3n s3.fs.buffer.dir to support multi directories. Contributed by Ted Malaska.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611489 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 21:56:22 +00:00
Colin McCabe
ef9e24f826 HADOOP-10591. Compression codecs must used pooled direct buffers or deallocate direct buffers when stream is closed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611423 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:17:18 +00:00
Owen O'Malley
1e7ce76bba HADOOP-10733. Fix potential null dereference in CredShell. (Ted Yu via
omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611419 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:09:41 +00:00
Owen O'Malley
9aaa714a99 HADOOP-10732. Fix locking in credential update. (Ted Yu via omalley)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611415 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:45:12 +00:00
Andrew Wang
9dff25e890 HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1. (Mike Yoder via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611229 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:49:08 +00:00
Allen Wittenauer
c477a166e1 HDFS-2538. option to disable fsck dots. Contributed by Mohammad Kamrul Islam.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611220 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:55:32 +00:00
Andrew Wang
77f0e2cca5 HDFS-6405. Test Crypto streams in HDFS. (yliu via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1611140 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 19:04:06 +00:00
Chris Nauroth
7f357d68cc HADOOP-10839. Add unregisterSource() to MetricsSystem API. Contributed by Shanyu Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611134 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:50:10 +00:00
Vinayakumar B
dc31d66f8a HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610964 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 10:48:15 +00:00
Chris Nauroth
619837039b HADOOP-10845. Add common tests for ACLs in combination with viewfs. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610911 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 05:16:42 +00:00
Yi Liu
beb0c19cde HADOOP-10735. Fall back AesCtrCryptoCodec implementation from OpenSSL to JCE if non native support. (yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610887 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 00:36:30 +00:00
Jing Zhao
790ee45643 HADOOP-10673. Update rpc metrics when the call throws an exception. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610879 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:05:40 +00:00
Andrew Wang
56c0bd4d37 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 21:10:24 +00:00
Jason Darrell Lowe
4dcc08b656 Addendum patch for HADOOP-10468 TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately. Contributed by Akira AJISAKA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610829 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 19:51:55 +00:00
Uma Maheswara Rao G
317542f51f HADOOP-10834. Typo in CredentialShell usage. (Benoy Antony via umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610794 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 18:22:13 +00:00
Uma Maheswara Rao G
65b0cfc96b HADOOP-10831. UserProvider is not thread safe. (Benoy Antony via umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610789 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 18:15:46 +00:00
Chris Nauroth
9fc972499f HADOOP-10810. Clean up native code compilation warnings. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610524 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 20:50:02 +00:00
Colin McCabe
425616861b HADOOP-10780. hadoop_user_info_alloc fails on FreeBSD due to incorrect sysconf use (trtrmitya via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610470 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 17:51:32 +00:00
Colin McCabe
905c90b066 HADOOP-10734. Implement high-performance secure random number sources. (Yi Liu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609874 13f79535-47bb-0310-9956-ffa450edef68
2014-07-12 01:29:26 +00:00
Andrew Wang
43342670db HADOOP-10736. Add key attributes to the key shell. Contributed by Mike Yoder.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609869 13f79535-47bb-0310-9956-ffa450edef68
2014-07-12 00:24:05 +00:00
Andrew Wang
d79f27b429 HDFS-6474. Namenode needs to get the actual keys and iv from the KeyProvider. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609833 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 20:54:47 +00:00
Chris Nauroth
520e458d4f HADOOP-10815. Implement Windows equivalent of mlock. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609588 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 23:26:16 +00:00
Alejandro Abdelnur
c30872a4ee Temporary removing files incorrect case in SVN that break OSX
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609581 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 22:11:01 +00:00
Chris Nauroth
5279f64cb6 HADOOP-10808. Remove unused native code for munlock. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609509 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 17:11:27 +00:00
Chris Nauroth
112145727e HADOOP-10507. FsShell setfacl can throw ArrayIndexOutOfBoundsException when no perm is specified. Contributed by Stephen Chu and Sathish Gurram.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609503 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 16:57:17 +00:00
Andrew Wang
a53262605a HADOOP-10812. Delegate KeyProviderExtension#toString to underlying KeyProvider. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609416 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 08:10:41 +00:00
Yi Liu
d90671137e HADOOP-10803. Update OpensslCipher#getInstance to accept CipherSuite#name format. (yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609403 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 06:27:52 +00:00
Colin McCabe
c030bac84f HADOOP-10781. Unportable getgrouplist usage breaks FreeBSD (Dmitry Sivachenko via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608869 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 18:15:25 +00:00
Andrew Wang
dda85637df Merge trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1608603 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:43:56 +00:00
Suresh Srinivas
55e7ddf514 HADOOP-10782. Fix typo in DataChecksum class. Contributed by Jingguo Yao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 18:10:42 +00:00
Aaron Myers
ed642b5d8d HADOOP-10769. Create KeyProvider extension to handle delegation tokens. Contributed by Arun Suresh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608286 13f79535-47bb-0310-9956-ffa450edef68
2014-07-06 19:16:45 +00:00
Alejandro Abdelnur
405dbd521e HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey methods to KeyProvider. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607918 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 19:41:00 +00:00
Alejandro Abdelnur
7b5295513d HADOOP-10757. KeyProvider KeyVersion should provide the key name. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607896 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 17:31:55 +00:00
Colin McCabe
03c858dad4 HADOOP-10693: add files left out of previous checkin (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607769 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 23:51:50 +00:00
Colin McCabe
bfef9807a0 HADOOP-10693. Implementation of AES-CTR CryptoCodec using JNI to OpenSSL (hitliuyi via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607768 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 23:40:31 +00:00
Steve Loughran
e09ea0c06e HADOOP-9361: Strictly define FileSystem APIs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607596 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:04:50 +00:00
Steve Loughran
362ae5143c HADOOP-10312 Shell.ExitCodeException to have more useful toString
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607591 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 11:28:02 +00:00
Andrew Wang
51b97a1396 HDFS-6605.Client server negotiation of cipher suite. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607499 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 23:08:29 +00:00
Chris Nauroth
e6b0f6d346 HADOOP-10767. Clean up unused code in Ls shell command. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607133 13f79535-47bb-0310-9956-ffa450edef68
2014-07-01 16:33:04 +00:00
Alejandro Abdelnur
950ae82571 HADOOP-10695. KMSClientProvider should respect a configurable timeout. (yoderme via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1606930 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 20:54:56 +00:00
Alejandro Abdelnur
4ac6e1d895 HADOOP-10710. hadoop.auth cookie is not properly constructed according to RFC2109. (Juan Yu via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1606923 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 20:41:13 +00:00
Jason Darrell Lowe
739b135dcc HADOOP-10739. Renaming a file into a directory containing the same filename results in a confusing I/O error. Contributed by chang li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1606267 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 23:22:35 +00:00
Andrew Wang
2efea95213 HDFS-6391. Get the Key/IV from the NameNode for encrypted files in DFSClient. Contributed by Charles Lamb and Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1606220 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 20:43:41 +00:00
Arpit Agarwal
bbbbd270c7 HADOOP-10649. Allow overriding the default ACL for service authorization (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1606179 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 18:43:42 +00:00
Arpit Agarwal
fdf901451f HADOOP-10565. Support IP ranges (CIDR) in proxyuser.hosts. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605987 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 08:32:51 +00:00
Chris Nauroth
d43112471b HADOOP-10754. Reenable several HA ZooKeeper-related tests on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605924 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 22:58:21 +00:00
Alejandro Abdelnur
6023da8ef9 Removing two zero java files
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1605881 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 19:18:09 +00:00
Brandon Li
f194aaa0d1 HADOOP-8943. Support multiple group mapping providers. Contributed by Kai Zheng
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605857 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 17:14:11 +00:00
Chris Nauroth
c3e26735a6 HADOOP-9705. FsShell cp -p does not preserve directory attibutes. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605672 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 05:36:54 +00:00
Ravi Prakash
7fcaab2350 HADOOP-10715. Remove public GraphiteSink#setWriter()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605646 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 01:50:58 +00:00
Tsz-wo Sze
988bc17bc3 HADOOP-10674. Improve PureJavaCrc32 performance and use java.util.zip.CRC32 for Java 7 and above.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605239 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 02:22:15 +00:00
Chris Nauroth
2eb913b6ec HADOOP-10747. Support configurable retries on SASL connection failures in RPC client. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605219 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 23:11:53 +00:00
Arpit Agarwal
b880b48b35 HADOOP-10652. Refactor Proxyusers to use AccessControlList. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605145 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:51:09 +00:00
Arpit Agarwal
b7e3c2eecd HADOOP-10746. TestSocketIOWithTimeout#testSocketIOWithTimeout fails on Power PC. (Contributed by Jinghui Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605140 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:15:41 +00:00
Arpit Agarwal
214aceb9f7 HADOOP-10659. Refactor AccessControlList to reuse utility functions and to improve performance. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604955 13f79535-47bb-0310-9956-ffa450edef68
2014-06-23 23:15:02 +00:00
Yi Liu
f43f0999d9 HADOOP-10713. Refactor CryptoCodec#generateSecureRandom to take a byte[]. (wang via yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1604537 13f79535-47bb-0310-9956-ffa450edef68
2014-06-22 07:20:47 +00:00
Arun Murthy
905c58ed27 Updated release notes for hadoop-2.4.1 rc1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604314 13f79535-47bb-0310-9956-ffa450edef68
2014-06-21 05:33:35 +00:00
Chris Nauroth
f8041b0540 HADOOP-9559. When metrics system is restarted MBean names get incorrectly flagged as dupes. Contributed by Mostafa Elhemali and Mike Liddell.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604225 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 18:24:03 +00:00
Arpit Agarwal
e74d99b81e HADOOP-10279. Create multiplexer, a requirement for the fair queue. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604090 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 05:53:41 +00:00
Aaron Myers
af6c91a80c HDFS-6403. Add metrics for log warnings reported by JVM pauses. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604074 13f79535-47bb-0310-9956-ffa450edef68
2014-06-20 02:38:00 +00:00
Alejandro Abdelnur
38e2322d84 HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604041 13f79535-47bb-0310-9956-ffa450edef68
2014-06-19 22:18:03 +00:00
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
Chris Nauroth
db437b7cbb HADOOP-10716. Cannot use more than 1 har filesystem. Contributed by Rushabh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603668 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 23:27:45 +00:00
Andrew Wang
5e5e1a6202 Merge trunk r1603663 to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1603664 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 23:15:04 +00:00
Tsz-wo Sze
1af69553a1 HDFS-6530. Fix Balancer documentation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603571 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 18:44:28 +00:00
Owen O'Malley
c79728478c HADOOP-10607. Create API to separate credential/password storage from
applications. (Larry McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603491 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 15:45:20 +00:00
Ravi Prakash
1adec79c7b HADOOP-10660. GraphiteSink should implement Closeable (Chen He and Ted Yu via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603379 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 09:27:03 +00:00
Vinayakumar B
44ac7437ad HADOOP-10590. ServiceAuthorizationManager is not threadsafe. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603356 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 05:29:03 +00:00
Chris Nauroth
6e37dd331b HADOOP-10557. FsShell -cp -pa option for preserving extended ACLs. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603222 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 17:08:07 +00:00
Jason Darrell Lowe
c1eda00e84 HADOOP-10699. Fix build native library on mac osx. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603042 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 02:23:58 +00:00
Andrew Wang
50cd2a6bed HADOOP-10666. Remove Copyright /d/d/d/d Apache Software Foundation from the source files license header. Contributed by Henry Saputra.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603025 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 23:23:33 +00:00
Chris Nauroth
05b8e8f7c1 HADOOP-10683. Users authenticated with KERBEROS are recorded as being authenticated with SIMPLE. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602991 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 20:30:04 +00:00
Charles Lamb
c5b7236d9c merge from trunk r1602933
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1602947 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 18:13:57 +00:00
Jing Zhao
b2ffbd8796 HADOOP-10657. Have RetryInvocationHandler log failover attempt at INFO level. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602941 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 17:51:37 +00:00
Arun Murthy
26936978be Preparing to release hadoop-2.4.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602886 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 15:07:00 +00:00
Sanford Ryza
41eca36855 HADOOP-10688. Expose thread-level FileSystem StatisticsData (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602516 13f79535-47bb-0310-9956-ffa450edef68
2014-06-13 20:45:24 +00:00
Chris Nauroth
d282b7d2cb HADOOP-10678. SecurityUtil has unnecessary synchronization on collection used for only tests. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602473 13f79535-47bb-0310-9956-ffa450edef68
2014-06-13 16:47:49 +00:00
Andrew Wang
be3fdd1c40 HADOOP-10691. Improve the readability of 'hadoop fs -help'. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602329 13f79535-47bb-0310-9956-ffa450edef68
2014-06-13 06:39:57 +00:00
Arpit Agarwal
ab54276440 HADOOP-6350. Document Hadoop Metrics. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602324 13f79535-47bb-0310-9956-ffa450edef68
2014-06-13 02:56:14 +00:00
Chris Nauroth
2368332138 HADOOP-10561. Copy command with preserve option should handle Xattrs. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602225 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 16:34:02 +00:00
Karthik Kambatla
fc7c8f9bf2 HADOOP-10686. Writables are not always configured. (Abraham Elmahrek via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602079 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 07:23:20 +00:00
Zhijie Shen
deb858a835 YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602071 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 06:40:32 +00:00
Arpit Agarwal
34e9173c00 HADOOP-10376. Refactor refresh*Protocols into a single generic refreshConfigProtocol. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602055 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 01:27:39 +00:00
Alejandro Abdelnur
8bfbec8cfb HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602040 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:35:18 +00:00
Jason Darrell Lowe
1758f3146a HADOOP-10622. Shell.runCommand can deadlock. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602033 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:05:04 +00:00
Brandon Li
ca8f112d2f HADOOP-10656. The password keystore file is not picked by LDAP group mapping. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601985 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 18:54:09 +00:00
Andrew Wang
123c563fe6 HDFS-6460. Ignore stale and decommissioned nodes in NetworkTopology#sortByDistance. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601535 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 00:39:20 +00:00
Aaron Myers
d4b9a04840 HADOOP-10664. TestNetUtils.testNormalizeHostName fails. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601478 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 18:53:19 +00:00
Charles Lamb
bdee397e95 HADOOP-6392. Wire crypto streams for encrypted files in DFSClient. (clamb and yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600582 13f79535-47bb-0310-9956-ffa450edef68
2014-06-05 10:10:48 +00:00
Yi Liu
d86db3f76f HADOOP-10662. NullPointerException in CryptoInputStream while wrapped stream is not ByteBufferReadable. Add tests using normal stream. Contributed by Yi Liu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600553 13f79535-47bb-0310-9956-ffa450edef68
2014-06-05 01:30:40 +00:00
Andrew Wang
02fcb6b6ba HDFS-6268. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1599734 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 18:33:09 +00:00
Aaron Myers
0634b42366 HADOOP-10658. SSLFactory expects truststores being configured. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1599435 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 07:23:16 +00:00
Ravi Prakash
ad5d0d7167 HADOOP 9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex Newman and Babak Behzad via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1599413 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 05:42:50 +00:00
Jing Zhao
cf03bdc3fc HADOOP-10630. Possible race condition in RetryInvocationHandler. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1599366 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 21:33:07 +00:00
Yi Liu
75ec5792df HADOOP-10653. Add a new constructor for CryptoInputStream that receives current position of wrapped stream. Contributed by Yi Liu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1599228 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 14:35:32 +00:00
Andrew Wang
880a0c673c HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598788 13f79535-47bb-0310-9956-ffa450edef68
2014-05-31 00:12:02 +00:00
Charles Lamb
871616b993 merge from trunk r1598783
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1598785 13f79535-47bb-0310-9956-ffa450edef68
2014-05-31 00:01:20 +00:00
Brandon Li
42391d260d HDFS-6056. Clean up NFS config settings. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598782 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 23:53:00 +00:00
Alejandro Abdelnur
12cf17555f HADOOP-10611. KMS, keyVersion name should not be assumed to be keyName@versionNumber. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598775 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 23:19:11 +00:00
Yi Liu
f7921030cd HADOOP-10635. Add a method to CryptoCodec to generate SRNs for IV. Contributed by Yi Liu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1598493 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 08:22:41 +00:00
Yi Liu
9c2848e076 HADOOP-10632. Minor improvements to Crypto input and output streams. Contributed by Yi Liu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1598485 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 08:08:36 +00:00