big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,908 Commits 2 Branches 2 Tags 264 MiB
03f7ed382b
Commit Graph

978 Commits

Author SHA1 Message Date
Colin Patrick Mccabe
f636f9d943 HDFS-7419. Improve error messages for DataNode hot swap drive feature (Lei Xu via Colin P. Mccabe) 2014-11-24 10:55:21 -08:00
Jason Lowe
b4ca727690 HADOOP-11309. System class pattern package.Foo should match package.Foo$Bar, too. Contributed by Gera Shegalov 2014-11-18 17:22:21 +00:00
Andrew Wang
48d62fad80 HADOOP-11311. Restrict uppercase key names from being created with JCEKS. 2014-11-17 13:59:46 -08:00
Brandon Li
351c5561c2 HDFS-7146. NFS ID/Group lookup requires SSSD enumeration on the server. Contributed by Yongjun Zhang 2014-11-17 13:23:53 -08:00
Aaron T. Myers
bd8196e85e HADOOP-11157. ZKDelegationTokenSecretManager never shuts down listenerThreadPool. Contributed by Arun Suresh. 2014-11-17 13:02:49 -08:00
Ravi Prakash
1a1dcce827 MAPREDUCE-5918. LineRecordReader can return the same decompressor to CodecPool multiple times (Sergey Murylev via raviprak) 2014-11-14 03:45:53 -08:00
Allen Wittenauer
ba879a5dad HADOOP-8989. hadoop fs -find feature (Jonathan Allen via aw) 2014-11-13 11:52:38 -08:00
Jian He
86bf8c7193 HADOOP-9576. Changed NetUtils#wrapException to throw EOFException instead of wrapping it as IOException. Contributed by Steve Loughran 2014-11-10 17:25:29 -08:00
Haohui Mai
a37a993453 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu. 2014-11-09 17:48:26 -08:00
cnauroth
68db5b3736 HADOOP-11282. Skip NFS TestShellBasedIdMapping tests that are irrelevant on Windows. Contributed by Chris Nauroth. 2014-11-07 14:30:29 -08:00
cnauroth
42bbe3794e HADOOP-11280. TestWinUtils#testChmod fails after removal of NO_PROPAGATE_INHERIT_ACE. Contributed by Chris Nauroth. 2014-11-07 00:02:17 -08:00
Aaron T. Myers
6ba52d88ec HADOOP-10714. AmazonS3Client.deleteObjects() need to be limited to 1000 entries per call. Contributed by Juan Yu. 2014-11-05 17:17:04 -08:00
Haohui Mai
8549fa5dc9 HADOOP-11267. TestSecurityUtil fails when run with JDK8 because of empty principal names. Contributed by Stephen Chu. 2014-11-05 15:34:27 -08:00
Haohui Mai
1eed102023 HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. 2014-11-04 10:52:05 -08:00
cnauroth
85da71c2d3 HADOOP-11165. TestUTF8 fails when run against java 8. Contributed by Stephen Chu. 2014-11-04 10:27:41 -08:00
Kihwal Lee
67f13b58e4 HADOOP-10987. Provide an iterator-based listing API for FileSystem. Contributed by Kihwal Lee. 2014-11-03 08:20:22 -06:00
cnauroth
5573b3476a HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth. 2014-10-30 22:48:25 -07:00
Brandon Li
72a556d3b0 HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang 2014-10-29 11:05:29 -07:00
cnauroth
c6f04f391b HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao. 2014-10-28 14:06:27 -07:00
cnauroth
5b1dfe78b8 HDFS-6934. Revert files accidentally committed. 2014-10-27 12:15:10 -07:00
cnauroth
463aec1171 HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth. 2014-10-27 09:38:30 -07:00
Byron Wong
28051e4155 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. 2014-10-25 12:31:41 -07:00
Karthik Kambatla
db45f047ab HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha) 2014-10-23 17:04:14 -07:00
cnauroth
6637e3cf95 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch. 2014-10-21 12:33:21 -07:00
Vinod Kumar Vavilapalli
1137557816 HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support proxy-users on Delegation-token management operations. Contributed by Zhijie Shen. 2014-10-17 15:56:07 -07:00
Ravi Prakash
466f08792f HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak) 2014-10-15 15:49:46 -07:00
Zhijie Shen
cdce88376a HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all sub-classes of AbstractDelegationTokenIdentifier. Contributed by Zhijie Shen. 2014-10-14 11:35:38 -07:00
cnauroth
1770bb942f HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao. 2014-10-13 10:56:32 -07:00
Uma Maheswara Rao G
8d7c54967d HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider (Yi Liu via umamahesh) 2014-10-09 20:06:41 +05:30
Zhijie Shen
a169051931 HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. Contributed by Craig Welch. 2014-10-08 15:36:16 -07:00
Arun C. Murthy
8f9ab998e2 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan. 2014-10-05 07:38:21 -07:00
cnauroth
69c9af9103 HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu. 2014-10-03 21:01:28 -07:00
Vinod Kumar Vavilapalli
5ca97f1e60 YARN-1063. Augmented Hadoop common winutils to have the ability to create containers as domain users. Contributed by Remus Rusanu. 
Committed as a YARN patch even though all the code changes are in common.
 2014-10-01 09:54:17 -07:00
arp
dde2ed13c2 Merge branch 'trunk' into HDFS-6581 2014-09-30 18:05:54 -07:00
Steve Loughran
a469833639 HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel) 2014-09-30 17:30:06 -07:00
cnauroth
b9158697a4 HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA. 2014-09-30 08:57:05 -07:00
arp
bb84f1fccb HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 2014-09-29 22:27:59 -07:00
arp
1e6b4b9b2e Merge branch 'trunk' into HDFS-6581 2014-09-29 14:01:47 -07:00
Andrew Wang
a78953c974 HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang) 2014-09-29 13:10:26 -07:00
Jason Lowe
cf4631d7c9 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee 2014-09-29 14:36:29 +00:00
arp
032e0eba6b Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 2014-09-25 19:50:28 -07:00
Colin Patrick Mccabe
1861b32eb5 HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe) 2014-09-25 13:11:59 -07:00
arp
b1000fbba4 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	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/INodeFile.java
 2014-09-24 20:08:32 -07:00
cnauroth
cbf0ae742a HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth. 2014-09-24 15:30:13 -07:00
arp
889122bd55 Merge branch 'trunk' into HDFS-6581 2014-09-22 18:00:58 -07:00
Vinayakumar B
eab15af12c HADOOP-10131. NetWorkTopology#countNumOfAvailableNodes() is returning wrong value if excluded nodes passed are not part of the cluster tree (Contributed by Vinayakumar B) 2014-09-22 11:25:56 +05:30
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
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
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
arp
849ccfa699 Merge branch 'trunk' into HDFS-6581 2014-09-18 11:06:40 -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
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
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
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
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
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
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
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
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
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
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
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
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -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
arp
217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -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
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
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
d1ae479aa5 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:45:40 -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
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
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
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
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
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