Andrew Wang
fc741b5d78
HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu.
2014-09-14 23:49:01 -07:00
Tsz-Wo Nicholas Sze
dba52ce0bb
Merge branch 'trunk' into HDFS-6584
2014-09-13 14:56:48 +08:00
arp
9f22fb8c9a
HDFS-6978. Directory scanner should correctly reconcile blocks on RAM disk. (Arpit Agarwal)
2014-09-12 22:13:18 -07:00
arp
7aeda47bd9
Merge branch 'trunk' into HDFS-6581
2014-09-12 11:45:11 -07:00
cnauroth
d6ce26986e
HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. Contributed by Chris Nauroth.
2014-09-11 20:58:15 -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
Jing Zhao
dc27ee9ae9
HDFS-7039. Archival Storage: fix Balancer tests. Contributed by Tsz Wo Nicholas Sze.
2014-09-11 14:19:18 -07:00
Jing Zhao
8de20a1987
Merge trunk into HDFS-6584
2014-09-11 13:04:35 -07:00
Jing Zhao
0d85f7e591
HDFS-7034. Archival Storage: Fix TestBlockPlacement and TestStorageMover. Contributed by Jing Zhao.
2014-09-11 13:00:43 -07:00
cnauroth
80ac6aabce
HDFS-7042. Upgrade fails for Windows HA cluster due to file locks held during rename in JournalNode. Contributed by Chris Nauroth.
2014-09-11 12:16:19 -07:00
Andrew Wang
1e684995d7
HDFS-7045. Fix NameNode deadlock when opening file under /.reserved path. Contributed by Yi Liu.
2014-09-11 10:59:09 -07:00
Andrew Wang
d1dab6cc63
HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman.
2014-09-11 10:32:20 -07:00
Andrew Wang
bf64fce78c
HDFS-6966. Add additional unit tests for encryption zones. Contributed by Stephen Chu.
2014-09-11 10:26:13 -07:00
Tsz-Wo Nicholas Sze
70dfe9cfab
Merge branch 'trunk' into HDFS-6584
2014-09-11 15:23:38 +08:00
Jing Zhao
db41a1b7b9
Merge changes from trunk
2014-09-09 22:47:50 -07:00
Alejandro Abdelnur
bbff44cb03
HDFS-6776. Using distcp to copy data between insecure and secure cluster via webdhfs doesn't work. (yzhangal via tucu)
2014-09-09 22:16:42 -07:00
Tsz-Wo Nicholas Sze
4124905aa5
HDFS-7028: FSDirectory should not get storage policy id from symlinks
2014-09-10 12:34:15 +08:00
arp
0de563a18e
HDFS-6482. Fix CHANGES.txt in trunk.
2014-09-09 18:09:10 -07:00
arp
0d2f6b4600
Merge branch 'trunk' into HDFS-6581
2014-09-09 18:07:18 -07:00
Konstantin V Shvachko
05af0ff4be
Revert HDFS-6940.
2014-09-09 17:30:10 -07:00
arp
be30c86cc9
HDFS-6482. Fix CHANGES.txt in trunk
2014-09-09 13:32:08 -07:00
cnauroth
2749fc677c
Newly moved block replica been invalidated and deleted in TestBalancer. Contributed by Binglin Chang.
2014-09-09 11:32:54 -07:00
arp
61ccd50362
Merge branch 'trunk' into HDFS-6581
...
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
2014-09-08 22:44:04 -07:00
arp
90c8ece188
HDFS-6981. Fix CHANGES.txt
2014-09-08 21:41:56 -07:00
arp
f949f6b548
HDFS-6981. Fix DN upgrade with layout version change. (Arpit Agarwal)
2014-09-08 21:20:55 -07:00
Andrew Wang
7498dd790e
Update CHANGES.txt for HDFS-6951
2014-09-08 17:01:25 -07:00
Andrew Wang
04915a0814
HDFS-6951. Correctly persist raw namespace xattrs to edit log and fsimage. Contributed by Charles Lamb.
2014-09-08 16:59:30 -07:00
Jing Zhao
6997c1c658
Merge remote-tracking branch 'origin/trunk' into HDFS-6584
2014-09-08 15:15:34 -07:00
arp
4ff128af12
Merge branch 'trunk' into HDFS-6581
2014-09-08 15:00:01 -07:00
Jing Zhao
867f0f141c
HDFS-7029. Archival Storage: fix TestDFSInotifyEventInputStream and TestDistributedFileSystem. Contributed by Tsz Wo Nicholas Sze.
2014-09-08 14:57:27 -07:00
arp
a18caf7753
HDFS-6991. Notify NN of evicted block before deleting it from RAM disk. (Arpit Agarwal)
2014-09-08 14:29:30 -07:00
Jing Zhao
74a7e227c8
HDFS-7027. Archival Storage: Mover does not terminate when some storage type is out of space. Contributed by Tsz Wo Nicholas Sze.
2014-09-08 14:21:26 -07:00
Jing Zhao
2b5c528a73
HDFS-6875. Archival Storage: support migration for a list of specified paths. Contributed by Jing Zhao.
2014-09-08 14:10:00 -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
Allen Wittenauer
6c790a7ab0
HDFS-6893. crypto subcommand is not sorted properly in hdfs\'s hadoop_usage (David Luo via aw)
2014-09-08 13:10:53 -07:00
Colin Patrick Mccabe
cad14aa916
HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe)
2014-09-08 12:51:56 -07:00
Kihwal Lee
6a84f88c11
HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp.
2014-09-08 14:41:44 -05:00
Haohui Mai
c1f8323234
HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs. Contributed by Ming Ma.
2014-09-08 11:07:23 -07:00
arp
ccdf0054a3
HDFS-6977. Delete all copies when a block is deleted from the block space. (Arpit Agarwal)
2014-09-08 10:35:54 -07:00
Tsz-Wo Nicholas Sze
f1432e2424
Merge branch 'trunk' into HDFS-6584
...
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
2014-09-08 10:54:48 +08:00
arp
eb8284d50e
Merge trunk into HDFS-6581
...
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
2014-09-07 14:46:46 -07:00
cnauroth
a23144fd8a
HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao.
2014-09-07 08:39:20 -07:00
arp
d1fa58292e
HDFS-6898. DN must reserve space for a full block when an RBW block is created. (Contributed by Arpit Agarwal)
2014-09-06 21:04:29 -07:00
Tsz-Wo Nicholas Sze
22a41dce4a
HDFS-6997: add more tests for data migration and replicaion.
2014-09-07 07:44:28 +08:00
arp
31bbeaf383
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
2014-09-06 12:28:22 -07:00
Konstantin V Shvachko
88209ce181
HDFS-6940. Refactoring to allow ConsensusNode implementation.
...
Contributed by Konstantin Shvachko.
2014-09-06 12:07:52 -07:00
Alejandro Abdelnur
3b35f81603
HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu)
2014-09-05 22:33:48 -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
Allen Wittenauer
a149afd9e6
HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw)
2014-09-05 13:50:42 -07:00
arp
fc68337049
HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao)
2014-09-05 13:50:42 -07:00
arp
c5ef9c9e69
HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao)
2014-09-05 13:50:42 -07:00
cnauroth
c828b8aa91
HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth.
2014-09-05 13:50:42 -07:00
cnauroth
2cd5b4f20d
HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.
2014-09-05 13:50:42 -07:00
Jing Zhao
54767d3ff4
Fix TestOfflineEditsViewer after merging.
2014-09-05 12:05:22 -07:00
Jing Zhao
300cb12bef
Merge trunk into HDFS-6584
2014-09-05 11:37:22 -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
arp
9609b7303a
HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao)
2014-09-05 11:10:58 -07:00
cnauroth
b051327ab6
HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth.
2014-09-05 11:07:41 -07:00
cnauroth
fab9bc58ec
HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.
2014-09-05 11:03:58 -07:00
arp
9e941d9f99
HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Contributed by Xiaoyu Yao)
2014-09-05 10:45:54 -07:00
Jing Zhao
c6107f566f
HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai.
2014-09-05 10:40:02 -07:00
Vinayakumar B
772d1fb01e
HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should shutdown cluster (vinayakumarb)
2014-09-05 10:25:09 +05:30
Jing Zhao
185200e709
HDFS-6876. Archival Storage: support set/get storage policy in DFSAdmin. Contributed by Jing Zhao.
2014-09-04 20:14:46 -07:00
Jing Zhao
6104520369
HDFS-6886. Use single editlog record for creating file + overwrite. Contributed by Yi Liu.
2014-09-04 18:54:38 -07:00
Jing Zhao
f7df24bb1b
HDFS-6996. SnapshotDiff report can hit IndexOutOfBoundsException when there are nested renamed directory/file. Contributed by Jing Zhao.
2014-09-04 16:12:44 -07:00
Jing Zhao
e08701ec71
HDFS-6961. Archival Storage: BlockPlacementPolicy#chooseTarget should check each valid storage type in each choosing round.
2014-09-04 14:19:32 -07:00
Alejandro Abdelnur
1a09536141
Fixing HDFS CHANGES.txt, missing HDFS-6905 entry
2014-09-04 11:07:08 -07:00
Colin Patrick Mccabe
f4caedfcbf
HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang
2014-09-03 19:30:30 -07:00
arp
3a0142bd77
HDFS-6848. Lack of synchronization on access to datanodeUuid in DataStorage#format. (Contributed by Xiaoyu Yao)
2014-09-03 17:17:06 -07:00
Jing Zhao
45d5b13256
Merge changes from trunk
2014-09-03 15:36:47 -07:00
arp
cb9b485075
HDFS-6930. Improve replica eviction from RAM disk. (Arpit Agarwal)
2014-09-03 13:53:01 -07:00
arp
08a8f2be81
Merge trunk into HDFS-6581
2014-09-03 10:53:37 -07:00
arp
762b04e994
HDFS-6950. Add Additional unit tests for HDFS-6581. (Contributed by Xiaoyu Yao)
2014-09-03 10:51:26 -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
Uma Maheswara Rao G
3425ae5d7e
HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh)
2014-09-03 18:53:51 +05:30
arp
a6b32a3e78
Merge trunk into HDFS-6581
2014-09-02 16:25:32 -07:00
Haohui Mai
08a9ac7098
HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang.
2014-09-02 16:22:18 -07:00
Colin Patrick Mccabe
727331becc
HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo.
2014-09-02 15:14:33 -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
Andrew Wang
faa4455be5
HDFS-6634. inotify in HDFS. Contributed by James Thomas.
2014-09-02 14:02:29 -07:00
Jing Zhao
3e2a0b5446
HDFS-6969. Archival Storage: INode#getStoragePolicyID should always return the latest storage policy. Contributed by Jing Zhao.
2014-09-01 17:56:04 -07:00
arp
217dea7794
Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581
2014-09-01 11:52:59 -07:00
Andrew Wang
6066b1a455
HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang.
2014-08-29 15:47:01 -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
Aaron T. Myers
7eab2a29a5
HDFS-6774. Make FsDataset and DataStore support removing volumes. Contributed by Lei Xu.
2014-08-29 13:00:17 -07:00
arp
4ae8178c56
HDFS-6800. Support Datanode layout changes with rolling upgrade. (Contributed by James Thomas)
2014-08-29 00:26:13 -07:00
arp
c92837aeab
HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal)
2014-08-28 23:13:46 -07:00
arp
4cf9afacbe
HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal)
2014-08-28 23:05:32 -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
Allen Wittenauer
d8774cc577
HADOOP-11013. CLASSPATH handling should be consolidated, debuggable (aw)
2014-08-28 18:09:25 -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
arp
2e987148e0
HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal)
2014-08-27 21:47:19 -07:00
arp
3f64c4aaf0
HDFS-6927. Initial unit tests for Lazy Persist files. (Arpit Agarwal)
2014-08-27 21:47:19 -07:00
arp
eb448e1439
HDFS-6926. DN support for saving replicas to persistent storage and evicting in-memory replicas. (Arpit Agarwal)
2014-08-27 21:47:19 -07:00
arp
a317bd7b02
HDFS-6925. DataNode should attempt to place replicas on transient storage first if lazyPersist flag is received. (Arpit Agarwal)
2014-08-27 21:47:19 -07:00
arp
c2354a7f81
HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
arp
042b33f20b
HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and edit logs. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
arp
7f49537ba1
HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal)
2014-08-27 21:47:18 -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
Jing Zhao
a26aa6bd07
HDFS-6944. Archival Storage: add retry and termination logic for Mover. Contributed by Jing Zhao.
2014-08-27 14:20:54 -07:00
Colin Patrick Mccabe
37549576e7
Add HDFS-6879 to CHANGES.txt
2014-08-27 14:18:18 -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
Jing Zhao
b7ded466b0
HDFS-6920. Archival Storage: check the storage type of delNodeHintStorage when deleting a replica. Contributed by Tsz Wo Nicholas Sze.
2014-08-27 14:08:02 -07:00
Colin Patrick Mccabe
b6b95ff667
HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe)
2014-08-27 13:49:31 -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
Colin Patrick Mccabe
d805cc27a9
HDFS-6773. MiniDFSCluster should skip edit log fsync by default. Contributed by Stephen Chu.
2014-08-27 13:33:02 -07:00
Haohui Mai
26ebdd849b
HDFS-6938. Cleanup javac warnings in FSNamesystem. Contributed by Charles Lamb.
2014-08-27 11:14:39 -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
Jing Zhao
8ea20b53a8
HDFS-6911. Archival Storage: check if a block is already scheduled in Mover. Contributed by Tsz Wo Nicholas Sze.
2014-08-27 10:38:10 -07:00
Jing Zhao
555900a9dc
Merge branch 'trunk' into HDFS-6584
2014-08-27 10:32:30 -07:00
Jing Zhao
6b441d227a
HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao.
2014-08-27 10:26:22 -07:00
arp
c5d9a4a91e
HDFS-6694. TestPipelinesFailover.testPipelineRecoveryStress tests fail intermittently with various symptoms - debugging patch (Contributed by Yongjun Zhang)
2014-08-27 09:52:33 -07:00
Allen Wittenauer
9ec4a930f5
HADOOP-10996. Stop violence in the *_HOME (aw)
2014-08-27 07:00:31 -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
e871955765
HDFS-6899. Allow changing MiniDFSCluster volumes per DN and capacity per volume. (Arpit Agarwal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619970 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:01:17 +00:00
Chris Nauroth
a83d055f25
HDFS-4852. libhdfs documentation is out of date. Contributed by Chris Nauroth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619967 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 05:30:21 +00:00
Arpit Agarwal
e6c3650070
HDFS-6829. DFSAdmin refreshSuperUserGroupsConfiguration failed in security cluster. (Contributed by zhaoyunjiong)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619882 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 18:14:55 +00:00
Alejandro Abdelnur
3aa3b0abc2
HDF-6905. fs-encryption merge triggered release audit failures. (clamb via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619667 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 05:17:22 +00:00
Jing Zhao
e69954d22c
HDFS-6906. Archival Storage: Add more tests for BlockStoragePolicy. Contributed by Tsz Wo Nicholas Sze.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619628 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:42:33 +00:00
Jing Zhao
603cbe5eea
HDFS-6863. Archival Storage: Support migration for snapshot paths. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619627 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:41:10 +00:00
Brandon Li
7b28f363b1
HDFS-6890. NFS readdirplus doesn't return dotdot attributes. Contributed by Brandon Li
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619500 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 17:53:54 +00:00
Tsz-wo Sze
c92d869d02
Merge r1609845 through r1619277 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619293 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 05:22:10 +00:00
Arpit Agarwal
6824abc19e
HDFS-6758. Block writer should pass the expected block size to DataXceiverServer (Arpit Agarwal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619275 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 01:13:49 +00:00
Arpit Agarwal
8f00897a4b
HDFS-6878. Change MiniDFSCluster to support StorageType configuration for individual directories. (Arpit Agarwal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619271 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 00:42:27 +00:00
Chris Nauroth
8304001861
HDFS-6858. Allow dfs.data.transfer.saslproperties.resolver.class default to hadoop.security.saslproperties.resolver.class. Contributed by Benoy Antony.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619256 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:46:35 +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
834fccf02b
Merge from trunk to branch
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619194 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:19:13 +00:00
Jing Zhao
f20d363126
HDFS-6870. Blocks and INodes could leak for Rename with overwrite flag. Contributed by Yi Liu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619192 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:13:03 +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
Brandon Li
fbc1ee4d6f
HDFS-6868. portmap and nfs3 are documented as hadoop commands instead of hdfs. Contributed by Brandon Li
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619001 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 22:31:57 +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
Tsz-wo Sze
4e324bcd3d
Merge r1609845 through r1618763 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618764 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 23:41:53 +00:00
Brandon Li
2fb04d2a30
HDFS-6569. OOB message can't be sent to the client when DataNode shuts down for upgrade. Contributed by Brandon Li
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618742 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 21:23:08 +00:00
Arpit Agarwal
1b5139b29a
HDFS-6188. An ip whitelist based implementation of TrustedChannelResolver. (Contributed by Benoy Antony)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618727 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:50:06 +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
Andrew Wang
bd616552cc
HDFS-6825. Edit log corruption due to delayed block removal. Contributed by Yongjun Zhang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618684 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:08:42 +00:00
Jing Zhao
5d5aae0694
HDFS-6801. Archival Storage: Add a new data migration tool. Contributed by Tsz Wo Nicholas Sze.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618675 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 17:51:18 +00:00
Arpit Agarwal
1c77c80410
HDFS-6783. Addendum patch to fix test failures. (Contributed by Yi Liu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618635 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 15:34:58 +00:00
Tsz-wo Sze
cb75b6b07d
Merge r1609845 through r1618416 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618417 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 21:02:21 +00:00
Tsz-wo Sze
9b250d74f0
HDFS-6847. Support storage policy on directories and include storage policy in HdfsFileStatus. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618416 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 20:58:20 +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
Aaron Myers
894b4e427f
HDFS-6850. Move NFS out of order write unit tests into TestWrites class. Contributed by Zhe Zhang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618091 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 02:33:24 +00:00
Charles Lamb
20dcb841ce
HDFS-6546. Add non-superuser capability to get the encryption zone for a specific path. (clamb)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618022 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 19:11:06 +00:00
Uma Maheswara Rao G
13ad623b9d
Updated contributors name in CHANGES.txt for HDFS-6783
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617880 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 04:57:47 +00:00
Uma Maheswara Rao G
44864c68b5
HDFS-6783. Fix HDFS CacheReplicationMonitor rescan logic. Contributed by Yi Liu and Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617872 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 04:20:00 +00:00
Alejandro Abdelnur
065d9ec5d9
HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617831 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 20:27:50 +00:00
Vinayakumar B
195961a7c1
HDFS-6247. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (vinayakumarb)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617799 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 18:43:05 +00:00
Vinayakumar B
6554994fab
Reverted
...
Merged revision(s) 1617784 from hadoop/common/trunk:
HDFS-6847. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (Contributed by Vinayakumar B.)
........
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617794 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 18:36:51 +00:00
Vinayakumar B
471b1368e2
HDFS-6847. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (Contributed by Vinayakumar B.)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617784 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 18:06:33 +00:00
Haohui Mai
03d8ff496a
HDFS-6567. Normalize the order of public final in HdfsFileStatus. Contributed by Tassapol Athiapinya.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617779 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 17:45:47 +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
a72fba5853
HDFS-6836. HDFS INFO logging is verbose & uses file appenders. (Contributed by Xiaoyu Yao)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617603 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:49:48 +00:00
Arpit Agarwal
662c5bb3af
HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a block replica. (Arpit Agarwal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617598 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:42:21 +00:00
Jing Zhao
37207b75d4
HDFS-6835. Archival Storage: Add a new API to set storage policy. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617568 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 19:32:09 +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
Jing Zhao
04884cd530
Merging r1616894 through r1617376 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617377 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 22:27:50 +00:00
Brandon Li
b760f20af1
HDFS-6582. Missing null check in RpcProgramNfs3#read(XDR, SecurityHandler). Contributed by Abhiraj Butala
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617366 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:34:02 +00:00
Haohui Mai
80691b073f
HDFS-6838. Code cleanup for unnecessary INode replacement. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617361 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:28:33 +00:00
Jing Zhao
e60673697d
HDFS-6837. Code cleanup for Balancer and Dispatcher. Contributed by Tsz Wo Nicholas Sze.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617337 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:01:14 +00:00
Jing Zhao
9d5f8fa68d
Merging r1616428 through r1616893 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616897 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 22:21:35 +00:00
Jing Zhao
c3cf331dc9
HDFS-6828. Separate block replica dispatching from Balancer. Contributed by Tsz Wo Nicholas Sze.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616889 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:33:57 +00:00
Arpit Agarwal
05d1bf4157
HDFS-6830. Revert accidental checkin
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616884 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:22:48 +00:00
Arpit Agarwal
a70c9de3f1
HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a block replica. (Arpit Agarwal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616883 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:20:19 +00:00
Ravi Prakash
a42231d19b
HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616846 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:24:10 +00:00
Ravi Prakash
6da830cfdf
HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616845 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:21:18 +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
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
Uma Maheswara Rao G
1fa2d6c4ba
HDFS-6834. Improve the configuration guidance in DFSClient when there are no Codec classes found in configs. Contributed by Uma Maheswara Rao G.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616721 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 11:35:16 +00:00
Arpit Agarwal
d3a2fe2807
HDFS-6772. Get DN storages out of blockContentsStale state faster after NN restarts. (Contributed by Ming Ma)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616680 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:41:38 +00:00
Haohui Mai
2ac640ec75
HDFS-6722. Display readable last contact time for dead nodes on NN webUI. Contributed by Ming Ma.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616669 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:27:47 +00:00
Aaron Myers
d758be1f35
HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:59:59 +00:00
Aaron Myers
eca80dca3e
HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616615 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:46:51 +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
Tsz-wo Sze
b50cb5e056
Merge r1609845 through r1616427 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616428 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:38:23 +00:00
Tsz-wo Sze
0ed8732fee
HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616426 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:30:53 +00:00
Tsz-wo Sze
83b9933db3
HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616422 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:18:48 +00:00
Jing Zhao
efc73a0f13
HDFS-6791. A block could remain under replicated if all of its replicas are on decommissioned nodes. Contributed by Ming Ma.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616306 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 19:03:07 +00:00
Allen Wittenauer
6fa66f2357
HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616262 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 16:07:52 +00:00
Allen Wittenauer
d7a57c27c6
HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616261 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 16:06:13 +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
812ac91add
HDFS-6790. DFSUtil Should Use configuration.getPassword for SSL passwords. Contributed by Larry McCay
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616058 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 00:50:07 +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
ac47ad11de
HDFS-6394. HDFS encryption documentation. (wang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616016 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 21:49:31 +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
Brandon Li
e2cb6e3c70
commit the additional doc change for HDFS-6717
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615801 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 21:30:42 +00:00
Brandon Li
c9aa747437
HDFS-6451. NFS should not return NFS3ERR_IO for AccessControlException. Contributed by Abhiraj Butala
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615702 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 17:40:02 +00:00
Uma Maheswara Rao G
431857d09d
HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615622 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 15:44:44 +00:00
Uma Maheswara Rao G
6e421f78b3
HDFS-6814. Mistakenly dfs.namenode.list.encryption.zones.num.responses configured as boolean. Contributed by Uma Maheswara Rao G.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615525 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 10:04:33 +00:00
Uma Maheswara Rao G
10db613389
HADOOP-10886. CryptoCodec#getCodecclasses throws NPE when configurations not loaded. Contributed by Uma Maheswara Rao G.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615523 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 09:56:57 +00:00
Vinayakumar B
33518e5613
HDFS-5185. DN fails to startup if one of the data dir is full. Contributed by Vinayakumar B.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615504 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 08:43:51 +00:00
Vinayakumar B
30a9ec26f7
HDFS-5723. Append failed FINALIZED replica should not be accepted as valid when that block is underconstruction. Contributed by Vinayakumar B.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615491 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 06:44:06 +00:00