Commit Graph

1545 Commits

Author SHA1 Message Date
Tsz-wo Sze 274d9b2ac4 HADOOP-10426. Declare CreateOpts.getOpt(..) with generic type argument, removes unused FileContext.getFileStatus(..) and fixes various javac warnings.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581437 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 18:07:56 +00:00
Tsz-wo Sze 9db6f98e0b HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581183 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 02:03:07 +00:00
Karthik Kambatla 830e367c96 HADOOP-10423. Clarify compatibility policy document for combination of new client and old server. (Chris Nauroth via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581116 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 23:26:34 +00:00
Chris Nauroth 935075121f HADOOP-10422. Remove redundant logging of RPC retry attempts. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581112 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 23:24:49 +00:00
Tsz-wo Sze f89ede8d86 HADOOP-10015. UserGroupInformation prints out excessive warnings. Contributed by Nicolas Liochon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580977 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 18:36:40 +00:00
Aaron Myers 0710b5890b HADOOP-10418. SaslRpcClient should not assume that remote principals are in the default_realm. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580666 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 00:00:57 +00:00
Chris Nauroth 62d28901d6 HADOOP-10191. Missing executable permission on viewfs internal dirs. Contributed by Gera Shegalov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580170 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 05:04:39 +00:00
Jing Zhao 9dab514b22 HDFS-6038. Allow JournalNode to handle editlog produced by new release with future layoutversion. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579813 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 23:06:06 +00:00
Arpit Agarwal 234edcadd5 HADOOP-10221. Add file missed in previous checkin, fix typo.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579387 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 20:23:05 +00:00
Arpit Agarwal f799618828 HADOOP-10221. Add a plugin to specify SaslProperties for RPC protocol based on connection properties. (Contributed by Benoy Antony and Daryn Sharp)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579382 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 20:16:55 +00:00
Tsz-wo Sze 37cb314f79 HADOOP-10407. Fix the javac warnings in org.apache.hadoop.ipc package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577710 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 21:12:25 +00:00
Christopher Douglas 6988a4fc71 HADOOP-3679. Fixup assert ordering in unit tests to yield meaningful error
messages. Contributed by Jay Vyas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577396 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:46:50 +00:00
Christopher Douglas 53790d3300 YARN-1771. Reduce the number of NameNode operations during localization of
public resources using a cache. Contributed by Sangjin Lee



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577391 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:30:35 +00:00
Jonathan Turner Eagles b44b648d08 HADOOP-10332. HttpServer's jetty audit log always logs 200 OK (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577220 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 16:10:54 +00:00
Michael Stack 66cde6a17f HADOOP-10337 ConcurrentModificationException from MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576187 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 04:34:13 +00:00
Vinod Kumar Vavilapalli 98ecd4ffef MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a large value of io.sort.mb is set. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576170 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 01:29:56 +00:00
Arpit Agarwal d74ec9dd20 HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576141 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:56:24 +00:00
Chris Nauroth 8e68f64daa HADOOP-10399. FileContext API for ACLs. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576124 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:10:41 +00:00
Colin McCabe 173c115951 HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575109 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 01:18:32 +00:00
Colin McCabe 5a3f614794 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574796 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:21:16 +00:00
Colin McCabe 95e0f616b9 HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574787 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 07:57:19 +00:00
Haohui Mai ad61eec072 HADOOP-10386. Log proxy hostname in various exceptions being thrown in a HA setup. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574716 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 23:09:47 +00:00
Arpit Agarwal 097e8b205e HADOOP-10211. Enable RPC protocol to negotiate SASL-QOP values between clients and servers. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574697 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 22:30:56 +00:00
Brandon Li 8e84dedd4c HDFS-6043. Give HDFS daemons NFS3 and Portmap their own OPTS. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574616 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:50:45 +00:00
Jing Zhao e1162ebb1f HDFS-5167. Add metrics about the NameNode retry cache. Contributed by Tsuyoshi OZAWA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574603 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:22:04 +00:00
Haohui Mai 95ebf9ecc4 HADOOP-10379. Protect authentication cookies with the HttpOnly and Secure flags. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574283 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 01:48:42 +00:00
Haohui Mai 53768eccf3 HADOOP-8691. FsShell can print "Found xxx items" unnecessarily often. Contributed By Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574261 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 00:01:17 +00:00
Tsz-wo Sze 291dbc3d27 svn merge --reintegrate https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535 back to trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574259 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:53:26 +00:00
Colin McCabe 1da076fd13 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574246 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:33:29 +00:00
Jing Zhao f9ebdea446 Merging r1573814 through r1574170 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1574171 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 18:22:26 +00:00
Colin McCabe 33500fd304 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573883 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:31:43 +00:00
Tsz-wo Sze 9ad8dd1e8a Merge r1569890 through r1573813 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573821 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 23:51:58 +00:00
Suresh Srinivas 1690856b24 HADOOP-10378. Typo in help printed by hdfs dfs -help. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573776 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 22:08:49 +00:00
Kihwal Lee 2626d3751e HADOOP-10314. The ls command help still shows outdated 0.16 format. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573604 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 16:40:25 +00:00
Colin McCabe dd049a2f60 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573433 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 03:58:37 +00:00
Tsz-wo Sze 0a7db7f179 Merge r1569890 through r1573119 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573120 13f79535-47bb-0310-9956-ffa450edef68
2014-03-01 01:14:38 +00:00
Arpit Agarwal d00605f8f0 HADOOP-10285. Admin interface to swap callqueue at runtime. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573052 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:48:31 +00:00
Tsz-wo Sze 9b81883952 Merge r1569890 through r1572722 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572723 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 20:39:34 +00:00
Chris Nauroth e5ccaa5d03 HADOOP-10353. FsUrlStreamHandlerFactory is not thread safe. Contributed by Tudor Scurtu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572679 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 18:53:54 +00:00
Tsz-wo Sze 9cc0d5d497 Merge r1569890 through r1572250 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572251 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 20:55:50 +00:00
Aaron Myers 4dfdee0c56 HADOOP-9454. Support multipart uploads for s3native. Contributed by Jordan Mendelson and Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572235 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 20:28:41 +00:00
Tsz-wo Sze abe9c4ee03 HADOOP-10368. InputStream is not closed in VersionInfo ctor. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572220 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 19:57:16 +00:00
Tsz-wo Sze abc9a6dad5 Merge r1569890 through r1571813 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571814 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 20:24:57 +00:00
Jing Zhao df6e1ab491 HDFS-5939. WebHdfs returns misleading error code and logs nothing if trying to create a file with no DNs in cluster. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571781 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:36:46 +00:00
Chris Nauroth d5639c85fb HADOOP-10361. Correct alignment in CLI output for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1571573 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 05:54:51 +00:00
Tsz-wo Sze 0809f32f4b Merge r1569890 through r1571508 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571509 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 01:16:30 +00:00
Devaraj Das ec23bf46e4 HADOOP-9968. Makes ProxyUsers to work with NetGroups. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570934 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 22:16:34 +00:00
Tsz-wo Sze e804c924fe Merge r1569890 through r1570786 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570787 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 04:31:48 +00:00
Aaron Myers e69614d650 HADOOP-10070. RPC client doesn't use per-connection conf to determine server's expected Kerberos principal name. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570776 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 01:09:54 +00:00
Arpit Agarwal d61d1c120d HADOOP-10278. Refactor to make CallQueue pluggable. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570703 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 20:53:34 +00:00
Tsz-wo Sze 78325b08c5 Merge r1569890 through r1570692 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570694 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 20:08:08 +00:00
Chris Nauroth 58fb83d982 HADOOP-10354. TestWebHDFS fails after merge of HDFS-4685 to trunk. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570655 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 18:42:06 +00:00
Jonathan Turner Eagles ce63b04977 MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570621 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:28:17 +00:00
Jonathan Turner Eagles aa4cbcfa79 MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570620 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:23:12 +00:00
Chris Nauroth 327d2ceca2 HADOOP-10352. Recursive setfacl erroneously attempts to apply default ACL to files. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570466 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:29:52 +00:00
Jing Zhao c316cd6271 HADOOP-10355. Fix TestLoadGenerator#testLoadGenerator. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570460 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:09:52 +00:00
Tsz-wo Sze 37afb4d683 Merge r1569890 through r1570391 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570392 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 23:47:58 +00:00
Chris Nauroth 835484c88f HADOOP-10328. loadGenerator exit code is not reliable. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570304 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:58:10 +00:00
Jing Zhao 8b196816d8 HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove it in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570295 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:34:24 +00:00
Tsz-wo Sze 55aec006f4 Merge r1569890 through r1570083 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570084 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 04:38:30 +00:00
Arpit Agarwal 2f341414dd HDFS-5318. Support read-only and read-write paths to shared replicas. (Contributed by Eric Sirianni)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569951 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 22:59:37 +00:00
Colin McCabe 06b504f4a6 HDFS-5973. add DomainSocket#shutdown method. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569950 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 22:57:32 +00:00
Tsz-wo Sze 72c214c89b Merge r1555021 through r1569889 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569890 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 19:57:36 +00:00
Chris Nauroth b20376df80 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569858 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:57:26 +00:00
Vinod Kumar Vavilapalli 9da9f7d4d8 YARN-1666. Modified RM HA handling of include/exclude node-lists to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569856 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:52:57 +00:00
Chris Nauroth 909eb7e4f1 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569833 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:24:02 +00:00
Tsz-wo Sze 99b4caa888 Merge r1555021 through r1569522 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569524 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 20:42:26 +00:00
Jason Darrell Lowe 4fe4268336 HADOOP-10346. Deadlock while logging tokens. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569382 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:23:29 +00:00
Chris Nauroth e288316acf Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569142 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 23:22:32 +00:00
Andrew Wang 04888258b7 HDFS-3128. Unit tests should not use a test root in /tmp. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568526 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:29:27 +00:00
Owen O'Malley 943d3f641c HADOOP-10342. Add a new method to UGI to use a Kerberos login subject to
build a new UGI. (Larry McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568525 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:25:12 +00:00
Vinod Kumar Vavilapalli 990cffdcfa YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568501 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 20:01:02 +00:00
Chris Nauroth d8fd23fc46 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568497 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 19:30:52 +00:00
Jing Zhao ba4b10354c Merging r1566359 through r1568420 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568437 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:32:37 +00:00
Suresh Srinivas 9d89fb8ca1 HADOOP-10249. LdapGroupsMapping should trim ldap password read from file. Contributed by Dilli Armugam.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568164 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:46:16 +00:00
Arpit Gupta 2417ca71d5 HADOOP-10343. Change info to debug log in LossyRetryInvocationHandler. Contributed by Arpit Gupta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568054 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 21:52:56 +00:00
Vinod Kumar Vavilapalli 2b916db60b YARN-1676. Modified RM HA handling of user-to-group mappings to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 21:23:33 +00:00
Chris Nauroth 17e48139c2 HADOOP-10344. Fix TestAclCommands after merging HADOOP-10338 patch. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1568026 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 20:17:00 +00:00
Chris Nauroth a49dee06fb Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567994 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 18:21:46 +00:00
Haohui Mai 9ee7c2a077 HDFS-5932. Ls should display the ACL bit. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567850 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 05:51:28 +00:00
Colin McCabe f0d64a078d HDFS-5940. Minor cleanups to ShortCircuitReplica, FsDatasetCache, and DomainSocketWatcher (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567835 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 03:10:48 +00:00
Chris Nauroth fc14360b03 HDFS-5923. Do not persist the ACL bit in the FsPermission. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567784 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:54:49 +00:00
Colin McCabe beb0d25d2a HDFS-5810. Unify mmap cache and short-circuit file descriptor cache (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567720 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 19:08:52 +00:00
Konstantin Shvachko fa78a7a99a HDFS-4858. HDFS DataNode to NameNode RPC should timeout. Contributed by Henry Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567535 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 07:01:29 +00:00
Colin McCabe 53fed66d91 HADOOP-10338. Cannot get the FileStatus of the root inode from the new Globber (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567497 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 02:12:11 +00:00
Chris Nauroth ff0abf1929 HDFS-5625. Add documentation example for setting a default ACL. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567422 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 22:20:42 +00:00
Chris Nauroth b0ab36ac01 HDFS-5625. Write end user documentation for HDFS ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567421 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 22:18:08 +00:00
Chris Nauroth dd03cd1336 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567238 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 17:55:07 +00:00
Arun Murthy 1b9cef0fdd Release notes for hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567118 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:32:07 +00:00
Chris Nauroth 3bf2f04bac Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566988 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 06:00:56 +00:00
Aaron Myers 5c7b27bae0 HADOOP-10326. M/R jobs can not access S3 if Kerberos is enabled. Contributed by bc Wong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566965 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 02:47:05 +00:00
Vinod Kumar Vavilapalli 1fa6ab249b YARN-1459. Changed ResourceManager to depend its service initialization on the configuration-provider mechanism during startup too. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566791 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 22:50:15 +00:00
Suresh Srinivas bfd158f323 HADOOP-10333. Fix grammatical error in overview.html document. Contributed by René Nyffenegger.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566709 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 19:34:54 +00:00
Chris Nauroth c6505f0499 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566100 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 19:05:12 +00:00
Tsz-wo Sze ccf08d9dc8 Merge r1555021 through r1565516 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565519 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 02:43:04 +00:00
Chris Nauroth c4b0ce0ace HADOOP-10327. Trunk windows build broken after HDFS-5746. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565389 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:40:23 +00:00
Jing Zhao d598b6ef9f HDFS-5873. dfs.http.policy should have higher precedence over dfs.https.enable. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564973 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:48:06 +00:00
Todd Lipcon 0aa09f6d5a HDFS-5399. Revisit SafeModeException and corresponding retry policies. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564629 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:18:31 +00:00
Vinod Kumar Vavilapalli b812af964d YARN-1669. Modified RM HA handling of protocol level service-ACLS to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564549 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 22:46:52 +00:00
Owen O'Malley 60c0fe8f6d HADOOP-10244. TestKeyShell improperly tests the results of delete (Larry
McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564137 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 00:11:54 +00:00
Vinod Kumar Vavilapalli 24fa232707 YARN-1667. Modified RM HA handling of super users (with proxying ability) to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564100 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 22:10:56 +00:00
Karthik Kambatla 88d8ea9509 HADOOP-10085. CompositeService should allow adding services while being inited. (Steve Loughran via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563694 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 19:51:39 +00:00
Tsz-wo Sze 35e59eeaa2 Merge r1555021 through r1563384 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 09:01:41 +00:00
Colin McCabe 140246bad8 HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563362 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:25:33 +00:00
Chris Nauroth 9e8cabf8ce Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563327 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:05:23 +00:00
Chris Nauroth d5f4f76a23 HADOOP-10270. getfacl does not display effective permissions of masked. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563219 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 18:59:16 +00:00
Tsz-wo Sze f2972402b7 Merge r1555021 through r1563041 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563042 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 03:24:24 +00:00
Jing Zhao 067d52b98c HADOOP-10295. Allow distcp to automatically identify the checksum type of source files and use it for the target. Contributed by Jing Zhao and Laurent Goujon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563019 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 23:53:23 +00:00
Arpit Agarwal f874b20061 HADOOP-10139. Update and improve the Single Cluster Setup document. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562931 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:28:56 +00:00
Aaron Myers 285854fc2e HADOOP-10310. SaslRpcServer should be initialized even when no secret manager present. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562863 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 15:49:47 +00:00
Chris Nauroth 10ef8a4b56 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1562670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:55:14 +00:00
Andrew Wang a3151a9f3d HADOOP-10305. Add rpc.metrics.quantile.enable and rpc.metrics.percentiles.intervals to core-default.xml. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562659 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:03:28 +00:00
Arpit Agarwal 874d3d4f5a HADOOP-10291. TestSecurityUtil#testSocketAddrWithIP fails due to test order dependency. (Contributed by Mit Desai)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562353 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 04:38:45 +00:00
Suresh Srinivas 33a47743a5 HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561959 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:32:52 +00:00
Tsz-wo Sze efcdf81ca9 Merge r1555021 through r1561943 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561944 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:37:13 +00:00
Michael Stack 52372eba8e HADOOP-10274 Lower the logging level from ERROR to WARN for UGI.doAs method (Takeshi Miao via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561934 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 04:57:47 +00:00
Todd Lipcon 6016d7d4da HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561882 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 22:15:01 +00:00
Aaron Myers e21a03f717 HADOOP-10250. VersionUtil returns wrong value when comparing two versions. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561860 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 21:36:42 +00:00
Arpit Agarwal 746ffd9549 HADOOP-10212. Incorrect compile command in Native Library document. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561838 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 20:38:43 +00:00
Arpit Agarwal e9f7f3624a HADOOP-9982. Fix dead links in hadoop site docs. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561813 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:51:08 +00:00
Arpit Agarwal 0be0174669 HADOOP-10086. User document for authentication in secure cluster. (Contributed by Masatake Iwasaki)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561776 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:32:52 +00:00
Chris Nauroth ad240d6b3a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561771 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:09:22 +00:00
Chris Nauroth b98b344b9a HADOOP-10277. setfacl -x fails to parse ACL spec if trying to remove the mask entry. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561769 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:03:30 +00:00
Aaron Myers 5e2d2dd56b HADOOP-10203. Connection leak in Jets3tNativeFileSystemStore#retrieveMetadata. Contributed by Andrei Savu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561720 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 16:18:04 +00:00
Tsz-wo Sze a9110e1788 Merge r1555021 through r1561510 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561516 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 16:34:30 +00:00
Jason Darrell Lowe 20176840f6 Addendum patch for HADOOP-9652 to fix performance problems. Contributed by Andrew Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561038 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 15:45:28 +00:00
Uma Maheswara Rao G 817be26c17 HADOOP-10248. Property name should be included in the exception where property value is null. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560906 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 06:27:40 +00:00
Chris Nauroth 738b076cc6 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560768 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:49:24 +00:00
Aaron Myers ba6f1a2ed1 HADOOP-10252. HttpServer can't start if hostname is not specified. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560450 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 18:10:59 +00:00
Haohui Mai 21a5bc7f2c HADOOP-10241. Clean up output of FsShell getfacl. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560194 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 21:20:39 +00:00
Michael Stack b2dd9d74c2 HBASE-10143 replace WritableFactories's hashmap with ConcurrentHashMap (Liang Xie via Stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559923 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 05:14:10 +00:00
Chris Nauroth cae96dfe6e HADOOP-10213. Fix bugs parsing ACL spec in FsShell setfacl. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559793 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 18:00:06 +00:00
Chris Nauroth 8a9a6dbd7e Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559324 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 06:50:19 +00:00
Tsz-wo Sze 1025121874 Merge r1555021 through r1559304 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1559305 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 02:24:38 +00:00
Haohui Mai 5300294fbe HDFS-5758. NameNode: complete implementation of inode modifications for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559267 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 22:05:47 +00:00
Daryn Sharp 5421725907 HADOOP-10146. Workaround JDK7 Process fd close bug (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558883 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:54:52 +00:00
Owen O'Malley e05ff82bd9 HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558867 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 17:48:50 +00:00
Brandon Li d3cb721ce0 HADOOP-10125. no need to process RPC request if the client connection has been dropped. Contributed by Min Ma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558575 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 21:51:55 +00:00
Suresh Srinivas 349f25a132 HADOOP-10236. Fix typo in o.a.h.ipc.Client#checkResponse. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558498 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 18:27:59 +00:00
Tsz-wo Sze 4a1abe5a3d Merge r1555021 through r1558254 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1558303 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 06:06:31 +00:00
Chris Nauroth a913cdb398 HADOOP-10234. "hadoop.cmd jar" does not propagate exit code. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558296 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 05:45:24 +00:00
Chris Nauroth 782a223add HADOOP-10228. FsPermission#fromShort() should cache FsAction.values(). Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558139 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 18:20:18 +00:00
Chris Nauroth c90211af7a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1557294 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:37:23 +00:00
Chris Nauroth f065f58292 HADOOP-10220. Add ACL indicator bit to FsPermission. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1557293 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:36:00 +00:00
Karthik Kambatla 6608b75829 YARN-1574. RMDispatcher should be reset on transition to standby. (Xuan Gong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557248 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:15:00 +00:00
Chris Nauroth 8e0ba42df4 HADOOP-10178. Configuration deprecation always emit "deprecated" warnings when a new key is used. Contributed by Shanyu Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557236 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 19:57:51 +00:00
Tsz-wo Sze 1c7aa44d62 Merge r1555021 through r1557038 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1557039 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 06:07:24 +00:00
Andrew Wang ed3f1454ec HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing time. Contributed by Liang Xie.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556983 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:41:41 +00:00
Karthik Kambatla 519d5d3014 HADOOP-10214. Fix multithreaded correctness warnings in ActiveStandbyElector (Liang Xie via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556734 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 06:34:54 +00:00
Chris Nauroth 17ab35314f Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556665 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 23:10:02 +00:00