Commit Graph

1823 Commits

Author SHA1 Message Date
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
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
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
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
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
Alejandro Abdelnur
6d7a6766bd HADOOP-10835. Implement HTTP proxyuser support in HTTP authentication client/server libraries. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617384 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 00:10:15 +00:00
Karthik Kambatla
af6d709664 HADOOP-10402. Configuration.getValByRegex does not substitute for variables. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617166 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 21:49:42 +00:00
Alejandro Abdelnur
74fe84393d HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616908 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 00:00:32 +00:00
Alejandro Abdelnur
021ae47115 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616903 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 23:10:11 +00:00
Charles Lamb
e6bdb33784 HADOOP-10919. Copy command should preserve raw.* namespace extended attributes. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616840 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 17:58:01 +00:00
Karthik Kambatla
14864e9c7c YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616769 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 14:17:54 +00:00
Alejandro Abdelnur
be9c67930b 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/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:58:58 +00:00
Alejandro Abdelnur
4e7c4a6e1f HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616671 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:55:38 +00:00
Andrew Wang
17e4365756 Revert HADOOP-10876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616658 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 01:37:59 +00:00
Brandon Li
8b32f84e87 HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders. Contributed by Larry McCay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616616 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:47:52 +00:00
Andrew Wang
311d2f0773 Merge from trunk to branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:26:52 +00:00
Arpit Agarwal
b98400df7b HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616575 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:42:09 +00:00
Yi Liu
2b5e044424 HDFS-6817. Fix findbugs and other warnings. (yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616092 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 04:43:58 +00:00
Brandon Li
a4f1292a53 HADOOP-10905. LdapGroupsMapping Should use configuration.getPassword for SSL and LDAP Passwords. Contributed by Larry McCay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616054 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 23:55:30 +00:00
Andrew Wang
34e3bbae9f HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616021 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 22:06:48 +00:00
Alejandro Abdelnur
a6cfaab5aa HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword for SSL Passwords. (lmccay via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616008 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 21:29:55 +00:00
Alejandro Abdelnur
b9984e59d8 HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616002 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 20:58:25 +00:00
Andrew Wang
7a246c447f Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615851 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 02:33:44 +00:00
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