Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,295 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

2536 Commits

Author SHA1 Message Date
Andrew Wang 1737950d0f HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. Contributed by Zhe Zhang. 2014-09-21 21:29:46 -07:00
arp 09dab88d3e Merge branch 'trunk' into HDFS-6581 2014-09-20 10:34:45 -07:00
Alejandro Abdelnur db890eef32 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) 2014-09-20 08:21:44 -07:00
cnauroth f85cc14eb4 HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 2014-09-19 21:23:26 -07:00
Andrew Wang b6ceef90e5 HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) 2014-09-19 17:42:00 -07:00
Andrew Wang adf0b67a71 HADOOP-10970. Cleanup KMS configuration keys. (wang) 2014-09-19 14:59:25 -07:00
Allen Wittenauer 9f03a7c018 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:33:07 -07:00
arp f8bbf80067 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-09-18 22:26:42 -07:00
Aaron T. Myers 6434572297 HADOOP-11109. Site build is broken. Contributed by Jian He. 2014-09-18 18:00:39 -07:00
Andrew Wang 8e73084491 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) 2014-09-18 17:49:17 -07:00
Tsz-Wo Nicholas Sze 98f7bfe993 Merge branch 'HDFS-6584' into trunk 2014-09-19 07:11:19 +08:00
Alejandro Abdelnur fad4cd85b3 KMS: Support for multiple Kerberos principals. (tucu) 2014-09-18 16:03:38 -07:00
arp 22295b4783 Merge branch 'trunk' into HDFS-6581 2014-09-18 15:59:37 -07:00
cnauroth 1b4b46004a HADOOP-11105. Update CHANGES.txt. 2014-09-18 15:41:19 -07:00
cnauroth 1942364ef1 HADOOP-11105. MetricsSystemImpl could leak memory in registered callbacks. Contributed by Chuan Liu. 2014-09-18 15:36:43 -07:00
Andrew Wang fe2f54d4cb HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) 2014-09-18 14:51:08 -07:00
arp 849ccfa699 Merge branch 'trunk' into HDFS-6581 2014-09-18 11:06:40 -07:00
Tsz-Wo Nicholas Sze 2d2b0009e6 Merge branch 'trunk' into HDFS-6584 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 2014-09-18 13:00:29 +08:00
Andrew Wang 10e8602f32 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang) 2014-09-17 20:14:40 -07:00
Andrew Wang bf38793ce1 Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:34 -07:00
Andrew Wang 47e5e19831 HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang) 2014-09-17 17:58:56 -07:00
Alejandro Abdelnur 123f20d42f HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) 2014-09-17 15:29:17 -07:00
arp a186d514bd Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 2014-09-17 15:03:55 -07:00
Colin Patrick Mccabe f230248525 HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe) 2014-09-17 14:27:32 -07:00
Colin Patrick Mccabe f24ac429d1 HDFS-6843. Add to CHANGES.txt 2014-09-17 13:38:11 -07:00
Jing Zhao 911979c8ab Merge changes from trunk 2014-09-17 13:12:45 -07:00
Colin Patrick Mccabe e3803d002c HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) 2014-09-17 12:55:35 -07:00
arp 24f8156886 Merge branch 'trunk' into HDFS-6581 2014-09-17 12:10:50 -07:00
Alejandro Abdelnur 8a7671d753 Revert "HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu)" 
This reverts commit 0a495bef5c.
 2014-09-17 11:11:33 -07:00
Alejandro Abdelnur 3f8f860cc6 Revert "HADOOP-10982" 
This reverts commit d9a86031a0.
 2014-09-17 11:11:15 -07:00
Alejandro Abdelnur d9a86031a0 HADOOP-10982 2014-09-17 11:08:00 -07:00
Alejandro Abdelnur 0a495bef5c HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) 2014-09-17 11:08:00 -07:00
Alejandro Abdelnur e4ddb6da15 HADOOP-11099. KMS return HTTP UNAUTHORIZED 401 on ACL failure. (tucu) 2014-09-17 11:07:56 -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 8cf1052beb HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) 2014-09-16 23:20:35 -07:00
Alejandro Abdelnur e14e71d5fe HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:20:35 -07:00
arp dcbc467301 HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal) 2014-09-16 18:19:57 -07:00
arp a24a9331d4 Merge branch 'trunk' into HDFS-6581 2014-09-16 18:18:09 -07:00
Jing Zhao 432b863719 Merge changes from trunk 2014-09-16 17:58:39 -07:00
Jing Zhao 2e4033e872 HDFS-7052. Archival Storage: Add Mover into hdfs script. Contributed by Jing Zhao. 2014-09-16 17:52:28 -07:00
Andrew Wang b6d3230e41 HADOOP-10922. User documentation for CredentialShell. Contributed by Larry McCay. 2014-09-16 17:15:23 -07:00
Allen Wittenauer 7971c97ec1 HADOOP-11022. User replaced functions get lost 2-3 levels deep (e.g., sbin) (aw) 2014-09-16 16:06:23 -07:00
arp 4603e4481f HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 2014-09-16 15:45:07 -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
arp e0d7fb48fb Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
 2014-09-16 14:32:57 -07:00
Allen Wittenauer ffdb7eb3b2 HADOOP-11055. non-daemon pid files are missing (aw) 2014-09-16 14:11:15 -07:00
Alejandro Abdelnur 7e08c0f23f HADOOP-10868. Addendum 2014-09-15 19:39:27 -07:00
Alejandro Abdelnur 932ae036ac HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:05:42 -07:00
Colin Patrick Mccabe 0ac760a58d HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe) 2014-09-15 16:49:15 -07:00
arp a7814e1aa4 Merge branch 'trunk' into HDFS-6581 2014-09-15 15:30:19 -07:00
Colin Patrick Mccabe 8008f0e819 HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files (cmccabe) 2014-09-15 14:47:27 -07:00
Kihwal Lee 2f847b3357 HDFS-7059. HAadmin transtionToActive with forceActive option can show 
confusing message. Contributed by Rushabh Shah.
 2014-09-15 16:27:22 -05:00
Jian He 88e329fdfb YARN-2529. Generic history service RPC interface doesn't work when service authorization is enabled. Contributed by Zhijie Shen 2014-09-15 13:13:54 -07:00
Aaron T. Myers 24d920b80e HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:27:07 -07:00
arp ebdd5e50d5 Merge branch 'trunk' into HDFS-6581 2014-09-12 20:53:18 -07:00
cnauroth 957414d4cb HADOOP-11088. Unittest TestKeyShell, TestCredShell and TestKMS assume UNIX path separator for JECKS key store path. Contributed by Xiaoyu Yao. 2014-09-12 14:50:07 -07:00
arp 7aeda47bd9 Merge branch 'trunk' into HDFS-6581 2014-09-12 11:45:11 -07:00
Karthik Kambatla 17ffbe0864 Update CHANGES.txt to set the release date for 2.5.1 2014-09-11 17:35:35 -07:00
Colin Patrick Mccabe 6c08339732 HADOOP-11074. Add JIRA to CHANGES.txt 2014-09-11 15:03:40 -07:00
Alejandro Abdelnur c656d7d6e5 HADOOP-11083. After refactoring of HTTP proxyuser to common, doAs param is case sensitive. (tucu) 2014-09-11 13:53:31 -07:00
Jason Lowe 581176cdc8 HADOOP-11085. Excessive logging by org.apache.hadoop.util.Progress when value is NaN. Contributed by Mit Desai 2014-09-11 19:53:25 +00:00
Colin Patrick Mccabe ac35e3464f HADOOP-10373: move CHANGES.txt entry to branch-2.6 2014-09-11 11:46:35 -07:00
Colin Patrick Mccabe a123d02f41 HADOOP-9540: move CHANGES.txt entry to 2.6 2014-09-11 11:31:58 -07:00
Colin Patrick Mccabe 5ec7fcd9dd HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) 2014-09-10 16:14:53 -07:00
Alejandro Abdelnur b02a4b4061 HADOOP-10758. KMS: add ACLs on per key basis. (tucu) 2014-09-10 14:26:15 -07:00
Alejandro Abdelnur b100949404 HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) 2014-09-09 22:19:42 -07:00
Alejandro Abdelnur 9ee891aa90 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) 2014-09-09 22:18:03 -07:00
cnauroth 6dae4b430c HADOOP-11057. checknative command to probe for winutils.exe on windows. Contributed by Xiaoyu Yao. 2014-09-09 21:38:29 -07:00
arp 0d2f6b4600 Merge branch 'trunk' into HDFS-6581 2014-09-09 18:07:18 -07:00
cnauroth 3e8f353c8e HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0. 2014-09-09 14:16:41 -07:00
arp 4ff128af12 Merge branch 'trunk' into HDFS-6581 2014-09-08 15:00:01 -07:00
Allen Wittenauer d989ac0444 MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw) 2014-09-08 13:15:46 -07:00
Alejandro Abdelnur df8c84cba8 HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) 2014-09-08 11:31:30 -07:00
arp 6e5f780d1d Merge branch 'trunk' into HDFS-6581 2014-09-08 10:37:26 -07:00
cnauroth 302d9a0a0d Credential Provider related Unit Test Failure on Windows. Contributed by Xiaoyu Yao. 2014-09-08 09:29:19 -07:00
arp 31bbeaf383 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-06 12:28:22 -07:00
Alejandro Abdelnur 0f3c19c1bb HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu) 2014-09-05 21:59:12 -07:00
Alejandro Abdelnur 71c8d735f5 HADOOP-11070. Create MiniKMS for testing. (tucu) 2014-09-05 21:59:12 -07:00
arp 339d21f273 Merge trunk into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
 2014-09-05 21:36:25 -07:00
arp 21c0cdeec1 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 14:29:57 -07:00
Karthik Kambatla 0571b4561b HADOOP-11065. Rat check should exclude **/build/**. (kasha) 2014-09-05 13:09:10 -07:00
Allen Wittenauer 7a62515c86 HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw) 2014-09-05 11:31:49 -07:00
arp 71269f7097 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 11:14:10 -07:00
cnauroth b44b2ee4ad HADOOP-11063. KMS cannot deploy on Windows, because class names are too long. Contributed by Chris Nauroth. 2014-09-04 11:47:18 -07:00
Alejandro Abdelnur b69a48c988 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) 2014-09-04 09:22:00 -07:00
Alejandro Abdelnur 70b218748b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:11:10 -07:00
Alejandro Abdelnur 41f1662d46 HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) 2014-09-04 09:09:39 -07:00
Colin Patrick Mccabe 8f1a668575 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. 2014-09-03 19:35:39 -07:00
Alejandro Abdelnur d9a03e272a HADOOP-10863. KMS should have a blacklist for decrypting EEKs. (asuresh via tucu) 2014-09-03 15:08:55 -07:00
arp 08a8f2be81 Merge trunk into HDFS-6581 2014-09-03 10:53:37 -07:00
Karthik Kambatla ce0462129f HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -07:00
arp a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Allen Wittenauer 0340206a29 HADOOP-11033. shell scripts ignore JAVA_HOME on OS X. (aw) 2014-09-02 14:44:47 -07:00
Andrew Wang a0ccf83dfd HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. 2014-09-02 14:22:20 -07:00
Steve Loughran 6595e92b64 Fix hadoop-common-project/hadoop-common/src/main/native/README to current mail list and URL 2014-09-02 20:29:38 +01:00
Steve Loughran 59384dfb71 HADOOP-10373 create tools/hadoop-amazon for aws/EMR support 2014-09-02 20:11:13 +01:00
Allen Wittenauer e06d2e3c98 HADOOP-11041. VersionInfo specifies subversion (Tsuyoshi OZAWA via aw) 2014-09-02 12:02:45 -07:00
Brandon Li 329b65958f Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk 2014-09-02 11:27:52 -07:00
Brandon Li bad5f38d47 HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li 2014-09-02 11:27:28 -07:00
Jason Lowe 01e8f056d9 HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne 2014-09-02 18:15:38 +00:00
Allen Wittenauer e1109fb656 HADOOP-11036. Add build directory to .gitignore (Tsuyoshi OZAWA via aw) 2014-09-02 10:10:06 -07:00
arp 217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -07:00
Benoy Antony 258c7d0f53 HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) 2014-08-30 12:49:19 -07:00
Karthik Kambatla 9ad413b19d HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) 2014-08-29 15:56:45 -07:00
Andrew Wang 93010faf10 Add CHANGES.txt for HADOOP-11021. 2014-08-29 14:56:01 -07:00
Alejandro Abdelnur c60da4d3b3 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) 2014-08-29 14:21:58 -07:00
arp f65183eba3 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-08-29 13:37:17 -07:00
Alejandro Abdelnur b1dce2aa21 HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu) 2014-08-29 11:53:22 -07:00
Alejandro Abdelnur 156e6a4f8a HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) 2014-08-29 11:23:23 -07:00
arp 7e32be8768 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-08-28 19:06:46 -07:00
Alejandro Abdelnur 2ca93d1fbf Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 19:05:57 -07:00
Alejandro Abdelnur bc6ce2cb34 Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release 2014-08-28 19:05:57 -07:00
Alejandro Abdelnur 6bf16d1156 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 19:05:57 -07:00
Allen Wittenauer d8774cc577 HADOOP-11013. CLASSPATH handling should be consolidated, debuggable (aw) 2014-08-28 18:09:25 -07:00
Andrew Wang 7119bd49c8 HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. 2014-08-28 17:40:55 -07:00
Todd Lipcon ab638e77b8 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. 2014-08-28 16:44:09 -07:00
arp bbaa7dc28d HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 2014-08-28 15:53:12 -07:00
Alejandro Abdelnur d9a7404c38 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:10:59 -07:00
Alejandro Abdelnur 88c5e2141c Fixing CHANGES.txt, moving HADOOP-8815 to 2.6.0 release 2014-08-28 15:07:57 -07:00
Alejandro Abdelnur d1ae479aa5 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:45:40 -07:00
arp 722cc92fa5 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-08-28 11:09:06 -07:00
Karthik Kambatla c4c9a78411 HADOOP-11001. Fix test-patch to work with the git repo. (kasha) 2014-08-27 23:12:57 -07:00
arp a7bcc95358 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
Colin Patrick Mccabe 7a16731191 HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 2014-08-27 19:47:10 -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
Colin Patrick Mccabe 225569ece2 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 2014-08-27 13:39:40 -07:00
Haohui Mai fdd3bc5f45 HADOOP-10746. HttpServer2 should not load JspServlet. Contributed by Haohui Mai. 2014-08-27 13:26:25 -07:00
brandonli cd9182d8b5 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li 2014-08-27 11:06:01 -07:00
Allen Wittenauer 9ec4a930f5 HADOOP-10996. Stop violence in the *_HOME (aw) 2014-08-27 07:00:31 -07:00
Allen Wittenauer a1618a2a77 HADOOP-11002. shell escapes are incompatible with previous releases (aw) 2014-08-27 06:56:59 -07:00
Karthik Kambatla dc154ab86d Add a section for 2.5.1 in CHANGES.txt 2014-08-27 00:55:19 -07:00
Arpit Agarwal 4b3a6b8722 HADOOP-10282. Create a FairCallQueue: a multi-level call queue which schedules incoming calls and multiplexes outgoing calls. (Contributed by Chris Li) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619938 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 22:16:15 +00:00
Allen Wittenauer 10d267975c HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619887 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 18:25:09 +00:00
Chris Nauroth b6c24472f3 HADOOP-10989. Work around buggy getgrouplist() implementations on Linux that return 0 on failure. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619659 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 04:05:18 +00:00
Allen Wittenauer 7be2808347 HADOOP-8896. Javadoc points to Wrong Reader and Writer classes in SequenceFile (Ray Chiang via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619632 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:58:25 +00:00
Jason Darrell Lowe da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 21:38:16 +00:00
Alejandro Abdelnur ddb7f12ef9 HADOOP-10992. Merge KMS to branch-2, updating hadoop-common CHANGES.txt. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619556 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:03:28 +00:00
Karthik Kambatla 9b8250c742 Set the release date for 2.5.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619237 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 21:33:19 +00:00
Andrew Wang b0f0ef17f0 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619203 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:56:56 +00:00
Andrew Wang d2a39b61aa Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 01:22:42 +00:00
Charles Lamb a4ee77b65f HDFS-6873. Constants in CommandWithDestination should be static. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618975 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 20:43:54 +00:00
Colin McCabe bf9aa34dea HADOOP-10968. hadoop native build fails to detect java_libarch on ppc64le (Dinar Valeev via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618919 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 18:10:00 +00:00
Allen Wittenauer 31467453ec HADOOP-9902. Shell script rewrite (aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618847 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 12:11:17 +00:00
Allen Wittenauer 379292aa97 HADOOP-10873. Fix dead link in Configuration javadoc (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618721 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 20:05:08 +00:00
Allen Wittenauer 4129a6e093 HADOOP-10972. Native Libraries Guide contains mis-spelt build line (Peter Klavins via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618719 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 20:00:56 +00:00
Andrew Wang 0cc08f6da4 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:41:31 +00:00
Todd Lipcon 55d7fecd09 Update CHANGES.txt for HDFS-6561 which was renamed to HADOOP-10975. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618686 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:09:38 +00:00
Arpit Agarwal 110cf46a07 HADOOP-10973. Native Libraries Guide contains format error. (Contributed by Peter Klavins) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618682 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:05:36 +00:00
Colin McCabe e446497cd1 HDFS-6561. org.apache.hadoop.util.DataChecksum should support native checksumming (James Thomas via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618680 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:02:37 +00:00
Jason Darrell Lowe 4a978bff3e HADOOP-10059. RPC authentication and authorization metrics overflow to negative values on busy clusters. Contributed by Tsuyoshi OZAWA and Akira AJISAKA 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618659 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 16:31:38 +00:00
Arpit Agarwal 86840834ed HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618503 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-17 19:02:45 +00:00
Arpit Agarwal 48505679c0 HADOOP-10335. Undo checkin to resolve test build issue. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618487 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-17 17:47:18 +00:00
Arpit Agarwal b47ad1ccba HADOOP-10335. An ip whilelist based implementation to resolve Sasl properties per connection. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618484 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-17 17:43:20 +00:00
Arpit Agarwal c1cd41cc49 HADOOP-10650. Add ability to specify a reverse ACL (black list) of users and groups. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618482 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-17 17:06:01 +00:00
Allen Wittenauer 31e478905a Wrong categorization for a variety of commits in the CHANGES.txt files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 16:47:34 +00:00
Alejandro Abdelnur e932365d6d HADOOP-10698. KMS, add proxyuser support. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618217 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 15:53:28 +00:00
Andrew Wang 16b7bd4e6c Move HADOOP-10121 to correct section of CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618105 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 05:53:03 +00:00
Andrew Wang cfeaf4cd09 HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618103 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 05:50:00 +00:00
Alejandro Abdelnur be117cbcdf HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618101 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 05:45:14 +00:00
Alejandro Abdelnur e86c9ef651 HADOOP-10770. KMS add delegation token support. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618096 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 05:03:58 +00:00
Allen Wittenauer 597b3fdc92 HADOOP-10231. Add some components in Native Libraries document (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618059 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 21:39:49 +00:00
Allen Wittenauer 399e428deb HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618044 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 20:28:36 +00:00
Todd Lipcon bd79a4b926 HADOOP-10838. Byte array native checksumming. Contributed by James Thomas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617875 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:29:35 +00:00
Colin McCabe e90d940699 HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617860 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 01:36:12 +00:00
Arpit Agarwal 2f3ed504c1 HADOOP-10966. Hadoop Common native compilation broken in windows. (Contributed by David Villegas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617823 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 20:01:21 +00:00
Allen Wittenauer e51a5d691b MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617806 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:34:26 +00:00
Allen Wittenauer cc93c1fd75 MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617804 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:18:50 +00:00
Allen Wittenauer 6ab25dfcd9 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) (continued) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617802 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:10:24 +00:00
Allen Wittenauer a34dafe325 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617775 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 17:30:26 +00:00
Arpit Agarwal e0a9e1bfb7 HADOOP-10281. Create a scheduler, which assigns schedulables a priority level. (Contributed by Chris Li) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617643 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 00:54:29 +00:00
Colin McCabe f7ac928a7c HADOOP-10962. Flags for posix_fadvise are not valid in some architectures (David Villegas via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617621 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 23:03:06 +00:00
Arpit Agarwal d687f6f689 HADOOP-10851. NetgroupCache does not remove group memberships. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617612 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 22:30:48 +00:00
Andrew Wang 0a2ee2fd53 HADOOP-10820. Throw an exception in GenericOptionsParser when passed an empty Path. Contributed by Alex Holmes and Zhihai Xu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617542 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 17:46:31 +00:00
Charles Lamb 74f7be0887 merge from trunk r1617527 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 17:02:07 +00:00
Charles Lamb acc3d73a45 HDFS-6839. Fix TestCLI to expect new output. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617526 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 16:50:18 +00:00
Alejandro Abdelnur 6d7a6766bd HADOOP-10835. Implement HTTP proxyuser support in HTTP authentication client/server libraries. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617384 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 00:10:15 +00:00
Karthik Kambatla af6d709664 HADOOP-10402. Configuration.getValByRegex does not substitute for variables. (Robert Kanter via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617166 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-10 21:49:42 +00:00
Alejandro Abdelnur 74fe84393d HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616908 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-09 00:00:32 +00:00
Alejandro Abdelnur 021ae47115 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616903 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 23:10:11 +00:00
Charles Lamb e6bdb33784 HADOOP-10919. Copy command should preserve raw.* namespace extended attributes. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616840 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 17:58:01 +00:00
Karthik Kambatla 14864e9c7c YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616769 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 14:17:54 +00:00
Alejandro Abdelnur be9c67930b HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 04:58:58 +00:00
Alejandro Abdelnur 4e7c4a6e1f HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616671 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 04:55:38 +00:00
Andrew Wang 17e4365756 Revert HADOOP-10876. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616658 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 01:37:59 +00:00
Brandon Li 8b32f84e87 HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders. Contributed by Larry McCay 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616616 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 22:47:52 +00:00
Andrew Wang 311d2f0773 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:26:52 +00:00
Arpit Agarwal b98400df7b HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616575 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 19:42:09 +00:00
Steve Loughran 96fc3b3ecd HADOOP-10931 compile error on tools/hadoop-openstack 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616482 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 12:38:35 +00:00
Yi Liu 2b5e044424 HDFS-6817. Fix findbugs and other warnings. (yliu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616092 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 04:43:58 +00:00
Brandon Li a4f1292a53 HADOOP-10905. LdapGroupsMapping Should use configuration.getPassword for SSL and LDAP Passwords. Contributed by Larry McCay 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616054 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 23:55:30 +00:00
Karthik Kambatla 4869fa2cfa Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616036 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 22:47:46 +00:00
Andrew Wang 34e3bbae9f HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616021 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 22:06:48 +00:00
Alejandro Abdelnur a6cfaab5aa HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword for SSL Passwords. (lmccay via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616008 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:29:55 +00:00
Alejandro Abdelnur 2d7dcff6f4 HADOOP-10791. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616005 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:21:03 +00:00
Alejandro Abdelnur b9984e59d8 HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616002 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 20:58:25 +00:00
Andrew Wang 7a246c447f Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615851 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:33:44 +00:00
Andrew Wang b7e67db372 HADOOP-10936. Change default KeyProvider bitlength to 128. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615850 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:32:44 +00:00
Andrew Wang ac73d416f3 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:30:54 +00:00
Andrew Wang 513dc29ce8 HADOOP-10937. Need to set version name correctly before decrypting EEK. Contributed by Arun Suresh. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615841 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:21:28 +00:00
Andrew Wang c8abf5f20a HADOOP-10927. Fix CredentialShell help behavior and error codes. Contributed by Josh Elser. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615827 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 00:20:30 +00:00