Commit Graph

2022 Commits

Author SHA1 Message Date
Alejandro Abdelnur 350ab4d246 HADOOP-10430. KeyProvider Metadata should have an optional description, there should be a method to retrieve the metadata from all keys. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586730 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 18:02:25 +00:00
Jing Zhao 01ea648056 HDFS-6229. Race condition in failover can cause RetryCache fail to work. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586714 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 16:42:46 +00:00
Jonathan Turner Eagles 0a0ca4f062 HADOOP-8826. Docs still refer to 0.20.205 as stable line (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586685 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 15:34:12 +00:00
Chris Nauroth 91ebf58904 HADOOP-10490. TestMapFile and TestBloomMapFile leak file descriptors. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586570 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 04:40:26 +00:00
Vinayakumar B d14976020e HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586433 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 19:28:21 +00:00
Vinayakumar B b0c828f4d3 Reverse merged revision(s) 1586425 from hadoop/common/trunk:
HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B)
........


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586432 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 19:26:17 +00:00
Vinayakumar B 3c1250bdf9 HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586425 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 19:02:30 +00:00
Alejandro Abdelnur 8c19d0bb7a HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586382 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 17:31:32 +00:00
Alejandro Abdelnur b4f0259f13 HADOOP-10428. JavaKeyStoreProvider should accept keystore password via configuration falling back to ENV VAR. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586216 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 05:09:12 +00:00
Alejandro Abdelnur 9a1f15532f HADOOP-10429. KeyStores should have methods to generate the materials themselves, KeyShell should use them. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586105 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 19:46:41 +00:00
Alejandro Abdelnur 98a98ea0c5 HADOOP-10427. KeyProvider implementations should be thread safe. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586103 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 19:43:35 +00:00
Alejandro Abdelnur 9a2ec694fe HADOOP-10432. Refactor SSLFactory to expose static method to determine HostnameVerifier. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586098 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 19:40:32 +00:00
Haohui Mai 0862ee6520 HADOOP-10485. Remove dead classes in hadoop-streaming. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586059 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 18:10:36 +00:00
Tsz-wo Sze f13a0fd2ad HADOOP-10473. TestCallQueueManager should interrupt before counting calls.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586030 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 16:49:31 +00:00
Steve Loughran b8f250a99d HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585932 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:20 +00:00
Jing Zhao 32bbc440c1 HADOOP-10475. ConcurrentModificationException in AbstractDelegationTokenSelector.selectToken(). Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585888 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 04:51:16 +00:00
Haohui Mai 8ca32df08e HADOOP-10474. Move o.a.h.record to hadoop-streaming. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585886 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 04:02:46 +00:00
Haohui Mai 38e011f4b1 HADOOP-10468. TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585659 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 08:19:14 +00:00
Tsz-wo Sze aea35d93e3 HADOOP-10466. Lower the log level in UserGroupInformation. Contributed by Nicolas Liochon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585538 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 18:07:13 +00:00
Tsz-wo Sze 62ad7e261a Commit the hadoop-common part of HDFS-6189.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584767 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 15:53:57 +00:00
Chris Nauroth 0941b99c86 HADOOP-10456. Bug in Configuration.java exposed by Spark (ConcurrentModificationException). Contributed by Nishkam Ravi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584575 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 09:22:03 +00:00
Uma Maheswara Rao G 362d284e17 HADOOP-10462. DF#getFilesystem is not parsing the command output. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584571 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 09:10:51 +00:00
Kihwal Lee b6e31fd8ea Fixing an error in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584441 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 22:46:14 +00:00
Jonathan Turner Eagles 7a655d5633 HADOOP-10454. Provide FileContext version of har file system. (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584431 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 22:20:47 +00:00
Aaron Myers 640a097533 HADOOP-10459. distcp V2 doesn't preserve root dir's attributes when -p is specified. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584227 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 00:32:25 +00:00
Haohui Mai fb1d7fb596 HDFS-5570. Deprecate hftp / hsftp and replace them with webhdfs / swebhdfs. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584100 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 17:28:08 +00:00
Tsz-wo Sze 5c7cb51775 HADOOP-10455. When there is an exception, ipc.Server should first check whether it is an terse exception.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583842 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 01:00:44 +00:00
Aaron Myers 8d62d92372 HADOOP-10414. Incorrect property name for RefreshUserMappingProtocol in hadoop-policy.xml. Contributed by Joey Echeverria.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583729 13f79535-47bb-0310-9956-ffa450edef68
2014-04-01 16:19:03 +00:00
Jing Zhao e908bbe807 HADOOP-10345. Sanitize the the inputs (groups and hosts) for the proxyuser configuration. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583454 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 20:42:13 +00:00
Jing Zhao ed64289c80 HADOOP-10451. Remove unused field and imports from SaslRpcServer. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583393 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 18:40:19 +00:00
Arun Murthy 8962a430a8 Added release notes for hadoop-2.4.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583253 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:48:04 +00:00
Arun Murthy fa9eed2ed6 Preparing for hadoop-2.4.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583245 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:36:13 +00:00
Ivan Mitic d46b2d0eb3 HADOOP-9525. Add tests that validate winutils chmod behavior on folders. Contributed by Ivan Mitic.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582958 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 06:26:54 +00:00
Jing Zhao 3c4d44d4ce HADOOP-10301. AuthenticationFilter should return Forbidden for failed authentication. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582883 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 21:20:13 +00:00
Chris Nauroth f5a8815492 HADOOP-10450. Build zlib native code bindings in hadoop.dll for Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582868 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 19:47:21 +00:00
Tsz-wo Sze 640a72efbe HADOOP-10449. Fix the javac warnings in the security package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582851 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:15:41 +00:00
Owen O'Malley 92b9c6ff60 HADOOP-10237. JavaKeyStoreProvider needs to set keystore permissions
correctly. (Larry McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582784 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 15:57:27 +00:00
Jonathan Turner Eagles b5b350c02e HADOOP-10442. Group look-up can cause segmentation fault when certain JNI-based mapping module is used. (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582451 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 19:56:26 +00:00
Jing Zhao d337a5ffc4 HADOOP-10441. Namenode metric rpc.RetryCache/NameNodeRetryCache.CacheHit can't be correctly processed by Ganglia. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582043 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 20:32:42 +00:00
Tsz-wo Sze a126a01fa1 HADOOP-10437. Fix the javac warnings in the conf and the util package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582015 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 19:03:16 +00:00
Tsz-wo Sze 3d207f1db2 HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly. Contributed by guodongdong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581964 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 17:48:04 +00:00
Arpit Agarwal 54c7f0637d HADOOP-10280. Add files missed in previous checkin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581533 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 21:35:11 +00:00
Arpit Agarwal c64974a863 HADOOP-10280. Make Schedulables return a configurable identity of user or group. (Contributed by Chris Li)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581532 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 21:34:21 +00:00
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
Brandon Li 3bfd18c6b0 HDFS-6050. NFS does not handle exceptions correctly in a few places. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581055 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 20:49:30 +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
Enis Soztutar b4d22bda3e HADOOP-10383 InterfaceStability annotations should have RetentionPolicy.RUNTIME
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578693 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 01:04:24 +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
Brandon Li 842aa2bc94 HDFS-6080. Improve NFS gateway performance by making rtmax and wtmax configurable. Contributed by Abin Shahab
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577319 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 21:03:59 +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 109e88bf17 HADOOP-10394. TestAuthenticationFilter is flaky. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576145 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:02:14 +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
Tsz-wo Sze b7428fe63d HADOOP-10393. Fix the javac warnings in hadoop-auth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575470 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 02:16:01 +00:00
Haohui Mai 55af4b0a79 Mark HADOOP-8691 in CHANGES.txt as incompatible changes.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575381 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 19:35:20 +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 206e2b0cd2 HDFS-6044. Add property for setting the NFS look up time for users. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574622 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:01:05 +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 21d921ac23 Update target version to 2.4.0 for HADOOP-10278 and HADOOP-10285 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573070 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 20:46:32 +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 ee663fad14 Merge r1569890 through r1573042 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573043 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:37:47 +00:00
Arpit Agarwal d7aa12e0e6 HADOOP-10374. InterfaceAudience annotations should have RetentionPolicy.RUNTIME. (Contributed by Enis Soztutar)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572783 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 23:31:55 +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 0d03b29f91 HADOOP-10353. Correct CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572680 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 18:58:09 +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
Chris Nauroth fe3f75730f HADOOP-10184. Move to 2.4.0 in CHANGES.txt in preparation for merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572190 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 18:43:00 +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 89cc2d3511 move HADOOP-10348 to branch 2.4.0 section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570296 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:37: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 3cee918a36 HDFS-4685. Move attribution to correct section of CHANGES.txt files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569854 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:49:30 +00:00
Chris Nauroth e472ffd515 HDFS-4685. Move attribution from CHANGES-HDFS-4685.txt to CHANGES.txt in hadoop-common and hadoop-hdfs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569841 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:33:59 +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
Arun Murthy 1417803326 Branching for hadoop-2.5 releases.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569185 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:38:51 +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
Arun Murthy c43c9dd7b5 Preparing to release hadoop-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567111 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:25:30 +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