Commit Graph

200 Commits

Author SHA1 Message Date
Wangda Tan 60f9e60b3b Preparing for 3.2.0 development
Change-Id: I6d0e01f3d665d26573ef2b957add1cf0cddf7938
2018-02-11 11:17:38 +08:00
Hanisha Koneru 6347b2253d HDFS-13023. Journal Sync does not work on a secure cluster. Contributed by Bharat Viswanadham. 2018-01-22 16:02:32 -08:00
Virajith Jalaparti 352f994b64 HDFS-12665. [AliasMap] Create a version of the AliasMap that runs in memory in the Namenode (leveldb). Contributed by Ewan Higgs. 2017-12-15 17:51:40 -08:00
Akira Ajisaka 44b06d34a5
HDFS-12889. Router UI is missing robots.txt file. Contributed by Bharat Viswanadham. 2017-12-06 11:40:33 +09:00
Inigo Goiri 81601dac8e HDFS-12273. Federation UI. Contributed by Inigo Goiri.
(cherry picked from commit adbb2e00c7)
2017-10-06 18:50:52 -07:00
Inigo Goiri cc58e7a983 HDFS-12384. Fixing compilation issue with BanDuplicateClasses. Contributed by Inigo Goiri.
(cherry picked from commit fabe02c8fa)
2017-10-06 18:50:49 -07:00
Inigo Goiri 7cb6bdf09e HDFS-10631. Federation State Store ZooKeeper implementation. Contributed by Jason Kace and Inigo Goiri.
(cherry picked from commit 23c4ddee11)
2017-10-06 18:50:49 -07:00
Inigo Goiri b3e6bd22e3 HDFS-10646. Federation admin tool. Contributed by Inigo Goiri.
(cherry picked from commit ae27e31fbc)
2017-10-06 18:50:48 -07:00
Inigo Goiri 55da7fd7eb HDFS-10687. Federation Membership State Store internal API. Contributed by Jason Kace and Inigo Goiri.
(cherry picked from commit 95cae08849)
2017-10-06 18:50:47 -07:00
Andrew Wang 0d419c984f Preparing for 3.1.0 development 2017-09-01 11:53:48 -07:00
Lei Xu ce797a1706 HDFS-12221. Replace xcerces in XmlEditsVisitor. (Ajay Kumar via lei) 2017-08-14 10:27:47 -07:00
Andrew Wang af2773f609 Updating version for 3.0.0-beta1 development 2017-06-29 17:57:40 -07:00
Andrew Wang 16ad896d5c Update maven version for 3.0.0-alpha4 development 2017-05-26 14:09:44 -07:00
Chris Douglas a5e57df3c5 HADOOP-14225. Remove xmlenc dependency 2017-04-10 11:48:40 -07:00
Andrew Wang 539ef5aa2e HFDS-11596. hadoop-hdfs-client jar is in the wrong directory in release tarball. Contributed by Yuanbo Liu. 2017-04-05 16:04:09 -07:00
Akira Ajisaka 09e6caec3d
HDFS-9651. All web UIs should include a robots.txt file. Contributed by Lars Francke. 2017-04-05 12:45:28 +09:00
Xiao Chen 88da9f6b67 Revert "HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang."
This reverts commit ada233b7cd.
2017-01-26 13:42:50 -08:00
Zhe Zhang 18e1d68209 HDFS-10534. NameNode WebUI should display DataNode usage histogram. Contributed by Kai Sasaki. 2017-01-25 09:58:39 -08:00
Andrew Wang 5d8b80ea9b Preparing for 3.0.0-alpha3 development 2017-01-19 15:50:07 -08:00
Andrew Wang 5f336512d0 HADOOP-13961. Fix compilation failure from missing hadoop-kms test jar. Contributed by Sangjin Lee and John Zhuge. 2017-01-11 15:48:50 -08:00
Akira Ajisaka 209e805430 HADOOP-13506. Redundant groupid warning in child projects. Contributed by Kai Sasaki. 2016-11-28 14:34:57 +09:00
Andrew Wang e1c6ef2efa HADOOP-13789. Hadoop Common includes generated test protos in both jar and test-jar. Contributed by Sean Busbey. 2016-11-08 16:33:55 -08:00
Akira Ajisaka 049e7d27be HDFS-10970. Update jackson from 1.9.13 to 2.x in hadoop-hdfs. 2016-11-07 11:16:31 +09:00
Robert Kanter 5877f20f9c HADOOP-10075. Update jetty dependency to version 9 (rkanter) 2016-10-27 16:09:00 -07:00
Andrew Wang da456ffd62 Preparing for 3.0.0-alpha2 development 2016-07-15 19:04:17 -07:00
Anu Engineer 4b93ddae07 HDFS-8821. Stop tracking CHANGES.txt in the HDFS-1312 feature branch. Contributed by Xiaobing Zhou 2016-06-23 18:18:48 -07:00
Anu Engineer 3df0781aa7 HDFS-9856. Suppress Jenkins warning for sample JSON file. Contributed by Xiaobing Zhou 2016-06-23 18:18:48 -07:00
Allen Wittenauer 730bc746f9 HADOOP-12930. Dynamic subcommands for hadoop shell scripts (aw)
This commit contains the following JIRA issues:

    HADOOP-12931. bin/hadoop work for dynamic subcommands
    HADOOP-12932. bin/yarn work for dynamic subcommands
    HADOOP-12933. bin/hdfs work for dynamic subcommands
    HADOOP-12934. bin/mapred work for dynamic subcommands
    HADOOP-12935. API documentation for dynamic subcommands
    HADOOP-12936. modify hadoop-tools to take advantage of dynamic subcommands
    HADOOP-13086. enable daemonization of dynamic commands
    HADOOP-13087. env var doc update for dynamic commands
    HADOOP-13088. fix shellprofiles in hadoop-tools to allow replacement
    HADOOP-13089. hadoop distcp adds client opts twice when dynamic
    HADOOP-13094. hadoop-common unit tests for dynamic commands
    HADOOP-13095. hadoop-hdfs unit tests for dynamic commands
    HADOOP-13107. clean up how rumen is executed
    HADOOP-13108. dynamic subcommands need a way to manipulate arguments
    HADOOP-13110. add a streaming subcommand to mapred
    HADOOP-13111. convert hadoop gridmix to be dynamic
    HADOOP-13115. dynamic subcommand docs should talk about exit vs. continue program flow
    HADOOP-13117. clarify daemonization and security vars for dynamic commands
    HADOOP-13120. add a --debug message when dynamic commands have been used
    HADOOP-13121. rename sub-project shellprofiles to match the rest of Hadoop
    HADOOP-13129. fix typo in dynamic subcommand docs
    HADOOP-13151. Underscores should be escaped in dynamic subcommands document
    HADOOP-13153. fix typo in debug statement for dynamic subcommands
2016-05-16 17:54:45 -07:00
Andrew Wang 3c5c57af28 HADOOP-13142. Change project version from 3.0.0 to 3.0.0-alpha1. 2016-05-12 18:27:28 -07:00
Andrew Wang ca5613af91 Revert "Update project version to 3.0.0-alpha1-SNAPSHOT."
This reverts commit 6b53802cba.
2016-05-12 15:32:45 -07:00
Andrew Wang 6b53802cba Update project version to 3.0.0-alpha1-SNAPSHOT. 2016-05-12 11:05:05 -07:00
Akira Ajisaka 32c0c3ecdf HDFS-10221. Add .json to the rat exclusions. Contributed by Ming Ma. 2016-03-31 09:06:14 +09:00
Chris Nauroth 89b16d27e2 HADOOP-12905. Clean up CHANGES.txt RAT exclusions from pom.xml files. Contributed by Chris Nauroth. 2016-03-08 21:22:06 -08:00
Chris Nauroth 2759689d7d HDFS-9239. DataNode Lifeline Protocol: an alternative protocol for reporting DataNode liveness. Contributed by Chris Nauroth. 2016-03-04 15:29:50 -08:00
Vinayakumar B a6728a013e HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B) 2016-02-04 13:37:51 +05:30
Tom Zeng b4c6b511e7 HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed to build Bigtop successfuly, see BIGTOP-2049
Signed-off-by: Konstantin Boudnik <cos@boudnik.org>
2015-11-24 18:36:34 -08:00
Haohui Mai 94a1833638 HDFS-2261. AOP unit tests are not getting compiled or run. Contributed by Haohui Mai. 2015-11-09 15:25:19 -08:00
Haohui Mai 65f53f246a HDFS-9168. Move client side unit test to hadoop-hdfs-client. Contributed by Haohui Mai. 2015-10-28 15:54:37 -07:00
Haohui Mai aa299ecd5e HDFS-8779. WebUI fails to display block IDs that are larger than 2^53 - 1. Contributed by Haohui Mai. 2015-10-13 13:53:28 -07:00
Vinayakumar B 39581e3be2 HDFS-9139. Enable parallel JUnit tests for HDFS Pre-commit (Contributed by Chris Nauroth and Vinayakumar B) 2015-10-13 19:00:08 +05:30
Haohui Mai d0c1e5fec4 HDFS-9215. Suppress the RAT warnings in hdfs-native-client module. Contributed by Haohui Mai. 2015-10-09 21:12:44 -07:00
Haohui Mai 3112f26368 HDFS-9170. Move libhdfs / fuse-dfs / libwebhdfs to hdfs-client. Contributed by Haohui Mai. 2015-10-07 00:06:33 -07:00
Colin Patrick Mccabe 892ade689f HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 2015-09-28 07:42:12 -07:00
Haohui Mai 7c5c099324 HDFS-8733. Keep server related definition in hdfs.proto on server side. Contributed by Mingliang Liu. 2015-09-22 20:57:05 -07:00
Jakob Homan 837fb75e8e HDFS-8155. Support OAuth2 in WebHDFS. 2015-08-29 18:37:05 -07:00
Haohui Mai 456e901a4c HDFS-6407. Add sorting and pagination in the datanode tab of the NN Web UI. Contributed by Haohui Mai. 2015-08-17 11:04:00 -07:00
Haohui Mai ddc867ceb9 HDFS-8816. Improve visualization for the Datanode tab in the NN UI. Contributed by Haohui Mai. 2015-07-29 17:14:05 -07:00
Haohui Mai fc6182d5ed HDFS-8726. Move protobuf files that define the client-sever protocols to hdfs-client. Contributed by Haohui Mai. 2015-07-08 10:37:10 -07:00
Andrew Wang 7673d4f205 HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
Allen Wittenauer ae14543420 HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout remaining forrest bits (aw) 2015-05-28 13:24:01 -07:00
Haohui Mai ada233b7cd HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang. 2015-05-24 22:30:32 -07:00
Vinayakumar B 55ed6558ba HADOOP-11743. maven doesn't clean all the site files (Contributed by ramtin) 2015-05-22 16:45:19 +05:30
Haohui Mai 16b74f978a HDFS-7893. Update the POM to create a separate hdfs-client jar. Contributed by Haohui Mai. 2015-04-02 15:29:18 -07:00
cnauroth c6d5b37a1c HDFS-7774. Unresolved symbols error while compiling HDFS on Windows 7/32 bit. Contributed by Kiran Kumar M R. 2015-02-26 13:37:46 -08:00
Colin Patrick Mccabe 09ad9a868a HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe) 2015-01-30 16:01:59 -08:00
Andrew Wang caf7298e49 HDFS-6673. Add delimited format support to PB OIV tool. Contributed by Eddy Xu. 2015-01-28 12:36:29 -08:00
Brandon Li 1bbcc3d032 HDFS-7424. Add web UI for NFS gateway. Contributed by Brandon Li 2014-12-04 10:46:26 -08:00
Haohui Mai d794f785de HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:52:03 -08:00
Haohui Mai 675bca2968 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:53:53 -07:00
Haohui Mai 8dfe54f6d3 Addendum patch for HDFS-7172. Contributed by Chris Nauroth. 2014-10-01 16:09:30 -07:00
Alejandro Abdelnur c0c7e6fabd HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) 2014-09-16 23:36:36 -07:00
Alejandro Abdelnur 3e85f5b605 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:36:07 -07:00
cnauroth fab9bc58ec HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth. 2014-09-05 11:03:58 -07:00
Andrew Wang faa4455be5 HDFS-6634. inotify in HDFS. Contributed by James Thomas. 2014-09-02 14:02:29 -07:00
Colin Patrick Mccabe 6962510f72 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 2014-08-27 14:12:05 -07:00
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
Chris Nauroth 70d453602c HDFS-573. Porting libhdfs to Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616814 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 16:26:45 +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
Steve Loughran f6436c0720 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614663 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 14:05:59 +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
Chris Nauroth 3b54223c0f HDFS-2856. Fix block protocol so that Datanodes don't require root or jsvc. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610474 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 18:10:03 +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
Haohui Mai 22cbcd16cb HADOOP-10717. Revert r1603571.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603620 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 20:37:25 +00:00
Steve Loughran bae5837d3b HADOOP-10717. Missing JSP support in Jetty
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603534 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 17:08:45 +00:00
Colin McCabe b98da7f3b5 HDFS-6539. test_native_mini_dfs is skipped in hadoop-hdfs pom.xml (decstery via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602998 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 20:35:45 +00:00
Charles Lamb 3f892e9d53 HDFS-6473. Protocol and API for Encryption Zones (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600803 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 01:42:18 +00:00
Uma Maheswara Rao G ac23a55547 Merge HDFS-2006 HDFS XAttrs branch to Trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596575 13f79535-47bb-0310-9956-ffa450edef68
2014-05-21 13:57:33 +00:00
Haohui Mai d777cb8996 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592069 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 22:26:02 +00:00
Colin McCabe 9a0dec60ff HDFS-4909. Avoid protocol buffer RPC namespace clashes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588091 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 22:58:40 +00:00
Haohui Mai 54c1daa580 HDFS-5978. Create a tool to take fsimage and expose read-only WebHDFS API. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582433 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 18:15:47 +00:00
Haohui Mai 2ed075e1bb Merging r1566042 through r1566364 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566375 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 19:45:00 +00:00
Jing Zhao a2edb11b68 HDFS-5698. Use protobuf to serialize / deserialize FSImage. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566359 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 19:18:51 +00:00
Chris Nauroth 9263f3bb14 HDFS-5596. Implement RPC stubs. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550544 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 21:47:46 +00:00
Jing Zhao c131ae39fc HDFS-5525. Inline dust templates for new Web UI. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543895 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 18:17:41 +00:00
Jing Zhao e68e3e429d HDFS-5393. Serve bootstrap and jQuery locally. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543248 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:37:54 +00:00
Jing Zhao fc99f3e8a3 HDFS-5382. Implement the UI of browsing filesystems in HTML 5 page. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534368 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 20:42:13 +00:00
Jonathan Turner Eagles a19b956975 HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533270 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 21:49:30 +00:00
Jing Zhao 909ab360c0 HDFS-5334. Implement dfshealth.jsp in HTML pages. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532949 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 01:31:33 +00:00
Chris Nauroth 5eb618ee1f HDFS-4491. Parallel testing HDFS. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520479 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 03:06:41 +00:00
Sanford Ryza f6a1f4d1e0 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1515711 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 06:24:22 +00:00
Alejandro Abdelnur 8451ab5c01 HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514068 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:15:04 +00:00
Alejandro Abdelnur 19b36f0900 HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513281 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 22:15:10 +00:00
Jason Darrell Lowe febc5040b9 HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503954 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:06:48 +00:00
Aaron Myers f61581501a Merge trunk into HDFS-347 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 01:12:07 +00:00
Alejandro Abdelnur 6bcbf492a2 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:13:44 +00:00
Todd Lipcon 797465820b Merge trunk into branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1437623 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 18:51:24 +00:00
Todd Lipcon e322e0a05f HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1434530 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 01:37:41 +00:00
Arun Murthy fabecd7f25 HDFS-4399. Fix RAT warnings by excluding images sub-dir in docs. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433461 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 15:39:54 +00:00
Todd Lipcon d79868d3e5 Add branch-specific CHANGES.txt file to RAT excludes list
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433232 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:20:34 +00:00
Thomas Graves e26da77544 HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1432933 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 14:36:40 +00:00