Commit Graph

1246 Commits

Author SHA1 Message Date
Todd Lipcon
aa65777ef0 HDFS-3898. QJM: enable TCP_NODELAY for IPC. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1383033 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 18:46:58 +00:00
Eli Collins
e1ffefa860 HDFS-3907. Allow multiple users for local block readers. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1383031 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 18:46:13 +00:00
Todd Lipcon
1cea56d6ef Merge trunk into QJM branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1383030 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 18:45:45 +00:00
Tsz-wo Sze
009235f4a9 HDFS-2656. Add libwebhdfs, a pure C client based on WebHDFS. Contributed by Jaimin D Jetly and Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382836 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 13:43:28 +00:00
Eli Collins
3a4dcfba57 HDFS-2757. Cannot read a local block that's being written to when using the local read short circuit. Contributed by Jean-Daniel Cryans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382409 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 06:37:31 +00:00
Arun Murthy
681408f898 Set date for hadoop-2.0.2-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382199 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:39:45 +00:00
Arun Murthy
7851676f22 Preparing for hadoop-2.0.2-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382191 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:09:48 +00:00
Aaron Myers
16234cbd5f HDFS-3897. QJM: TestBlockToken fails after HDFS-3893. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1381842 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 02:01:21 +00:00
Aaron Myers
df801074c9 HDFS-3893. QJM: Make QJM work with security enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1381770 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 21:42:14 +00:00
Alejandro Abdelnur
9da626af41 HDFS-3895. hadoop-client must include commons-cli (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381719 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 19:03:37 +00:00
Uma Maheswara Rao G
0654590853 Removed unnecessary .org files added in previous commit HDFS-3809
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381700 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 18:05:30 +00:00
Uma Maheswara Rao G
6fd7df77a5 HDFS-3809. Make BKJM use protobufs for all serialization with ZK. Contributed by Ivan Kelly
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381699 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 18:03:16 +00:00
Todd Lipcon
8b88542f60 Amend HDFS-3726. Add previously missing file JournalOutOfSyncException.java
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1381681 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 16:59:51 +00:00
Daryn Sharp
82b981cca4 HDFS-3890. filecontext mkdirs doesn't apply umask as expected (Tom Graves via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381606 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:06:58 +00:00
Todd Lipcon
cae8116a14 HDFS-3726. If a logger misses an RPC, don't retry that logger until next segment. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1381482 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 07:03:57 +00:00
Todd Lipcon
437948ea1c HDFS-3891. Make selectInputStreams throw IOE instead of RTE. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1381481 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 06:57:18 +00:00
Eli Collins
01db4d2bb2 HDFS-3828. Block Scanner rescans blocks too frequently. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381472 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 06:19:30 +00:00
Eli Collins
91e832e7b4 HADOOP-8770. NN should not RPC to self to find trash defaults. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381319 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 19:42:09 +00:00
Todd Lipcon
99ec5bd8d3 Merge trunk into QJM branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1380990 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:57:47 +00:00
Todd Lipcon
31142aa892 HDFS-1490. TransferFSImage should timeout. Contributed by Dmytro Molkov and Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380988 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:53:15 +00:00
Todd Lipcon
c334cc89a8 HDFS-2793. Add an admin command to trigger an edit log roll. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380982 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:40:23 +00:00
Todd Lipcon
13daca1ef6 HDFS-3870. Add metrics to JournalNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1380980 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:30:51 +00:00
Todd Lipcon
f6b7f067c3 HDFS-3884. Journal format() should reset cached values. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1380979 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:27:49 +00:00
Todd Lipcon
72485f3112 HDFS-3869. Expose non-file journal manager details in web UI. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1380978 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:16:02 +00:00
Todd Lipcon
8021d9199f HDFS-3863. Track last "committed" txid in QJM. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1380976 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:13:19 +00:00
Tsz-wo Sze
658e7b5818 HDFS-3888. Clean up BlockPlacementPolicyDefault. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380939 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 23:56:10 +00:00
Tsz-wo Sze
f3927595cc HDFS-3887. Remove redundant chooseTarget methods in BlockPlacementPolicy. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380934 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 23:48:01 +00:00
Alejandro Abdelnur
4244c1443c HDFS-3866. HttpFS POM should have property where to download tomcat from (zero45 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380927 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 22:55:40 +00:00
Robert Joseph Evans
f5943c1eef Updated CHANGES.txt for 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380906 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 21:45:33 +00:00
Uma Maheswara Rao G
3969bcb7c9 HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380003 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 16:20:13 +00:00
Suresh Srinivas
da3bd67138 HDFS-3880. Use Builder to build RPC server in HDFS. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379917 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 06:20:41 +00:00
Harsh J
54e612bfb9 HDFS-2580. NameNode#main(...) can make use of GenericOptionsParser. Contributed by harsh. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379828 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 19:22:11 +00:00
Tsz-wo Sze
50222ff529 HDFS-3871. Change NameNodeProxies to use RetryUtils. Contributed by Arun C Murthy
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379743 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 11:41:15 +00:00
Eli Collins
6f5ae49063 HDFS-3877. QJM: Provide defaults for dfs.journalnode.*address. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1379681 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 00:35:19 +00:00
Owen O'Malley
c76a7893f9 HDFS-3466. Get HTTP kerberos principal from the web authentication keytab.
(omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379646 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 22:31:03 +00:00
Daryn Sharp
94c69f2c82 HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379623 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:31:55 +00:00
Daryn Sharp
3819c964fa HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379615 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:24:48 +00:00
Suresh Srinivas
2fd49f5a57 HDFS-3833. TestDFSShell fails on windows due to concurrent file read/write. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379525 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 17:43:35 +00:00
Eli Collins
7d1c8d92f9 HDFS-3733. Audit logs should include WebHDFS access. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379278 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 04:08:23 +00:00
Eli Collins
34d1e73235 HDFS-3837. Fix DataNode.recoverBlock findbugs warning. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379172 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:40:28 +00:00
Daryn Sharp
bb64f860eb HDFS-3861. Deadlock in DFSClient (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379093 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:46:14 +00:00
Aaron Myers
b2d186d865 HDFS-3864. NN does not update internal file mtime for OP_CLOSE when reading from the edit log. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378413 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 01:19:07 +00:00
Aaron Myers
d4d2bf73a9 HDFS-3849. When re-loading the FSImage, we should clear the existing genStamp and leases. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378364 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:09:27 +00:00
Aaron Myers
8d724dd8b9 HDFS-3860. HeartbeatManager#Monitor may wrongly hold the writelock of namesystem. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378228 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 17:01:38 +00:00
Eli Collins
36c5388080 Fixup CHANGELOG for HDFS-3856.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377936 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:45:26 +00:00
Eli Collins
b29cb2d997 HDFS-3856. TestHDFSServerPorts failure is causing surefire fork failure. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377934 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:41:13 +00:00
Todd Lipcon
1e68d4726b HDFS-3845. Fixes for edge cases in QJM recovery protocol. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1377809 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 19:55:01 +00:00
Suresh Srinivas
735046ebec HDFS-3851. DFSOutputStream class code cleanup. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377372 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 04:00:26 +00:00
Aaron Myers
56285e1bee HDFS-3683. Edit log replay progress indicator shows >100% complete. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377367 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 00:31:12 +00:00
Suresh Srinivas
deead78e35 HDFS-3844. Add @Override and remove {@inheritdoc} and unnecessary imports. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377168 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 01:03:22 +00:00
Eli Collins
a11042365f HDFS-3731. 2.0 release upgrade must handle blocks being written from 1.0. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377137 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 22:10:38 +00:00
Aaron Myers
a8ff292669 Merge trunk into HDFS-3077 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1377092 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 20:38:08 +00:00
Aaron Myers
92cb6b093c HDFS-3678. Edit log files are never being purged from 2NN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377046 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 18:52:59 +00:00
Suresh Srinivas
a95bbb107f Correcting the jira number back to HDFS-3834 from HDFS-3844. I should pay better attention.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377008 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:53:19 +00:00
Suresh Srinivas
8c8d679cd5 Correcting the jira number from HDFS-3834 to HDFS-3844 for the commit 1377001
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377007 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:51:10 +00:00
Suresh Srinivas
7a1dc1ab70 HDFS-3834. Remove unused static fields NAME, DESCRIPTION and Usage from Command. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377001 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:36:22 +00:00
Tsz-wo Sze
c46de830da HDFS-3177. Update DFSClient and DataXceiver to handle different checkum types in file checksum computation. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376928 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:15:14 +00:00
Eli Collins
c10a73350e Revert HDFS-3837. Fix DataNode.recoverBlock findbugs warning.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376701 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 21:08:19 +00:00
Eli Collins
26c259a638 Ammend previous commit to remove TestFileCreationNamenodeRestart.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376698 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 21:02:57 +00:00
Eli Collins
6885d03501 HDFS-3715. Fix TestFileCreation#testFileCreationNamenodeRestart. Contributed by Andrew Whang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376689 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 20:49:55 +00:00
Aaron Myers
de8b34a70e HDFS-3835. Long-lived 2NN cannot perform a checkpoint if security is enabled and the NN restarts with outstanding delegation tokens. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376188 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:47:07 +00:00
Eli Collins
aa6f18e81b HDFS-3839. QJM: hadoop-daemon.sh should be updated to accept "journalnode". Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1376187 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:46:00 +00:00
Jitendra Nath Pandey
901b1739c6 HDFS-3819. Should check whether invalidate work percentage default value is not greater than 1.0f. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376185 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:44:44 +00:00
Suresh Srinivas
30bd8ef9d1 Moving HDFS-2686 and HDFS-3832 to branch-2 section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376142 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 17:04:08 +00:00
Suresh Srinivas
380870d544 HDFS-3832. Remove protocol methods related to DistributedUpgrade. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376139 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:59:50 +00:00
Eli Collins
89e16be81b HDFS-3837. Fix DataNode.recoverBlock findbugs warning. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376129 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:26:50 +00:00
Eli Collins
2b030c6a4a HDFS-3830. test_libhdfs_threaded: use forceNewInstance. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376121 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:19:27 +00:00
Suresh Srinivas
a99cfe3ca0 HDFS-3817. Avoid printing SafeModeException stack trace in RPC server. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376054 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:59:40 +00:00
Suresh Srinivas
557b937f47 HDFS-3827. TestHASafeMode#assertSafemode method should be made static. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375828 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 22:25:49 +00:00
Suresh Srinivas
6c0ccb5989 HDFS-2686. Remove DistributedUpgrade related code. Contributed by Suresh Srinivas
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375800 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 21:18:40 +00:00
Tsz-wo Sze
f2dd818201 HADOOP-8239. Add subclasses of MD5MD5CRC32FileChecksum to support file checksum with CRC32C. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375450 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 09:44:46 +00:00
Eli Collins
a6262430ff HDFS-2727. libhdfs should get the default block size from the server. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375383 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 03:48:00 +00:00
Aaron Myers
f9a0d78ef5 HDFS-3826. QJM: Some trivial logging / exception text improvements. Contributed by Todd Lipcon and Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1375356 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 00:48:06 +00:00
Eli Collins
97bb7b180e HDFS-3707. TestFSInputChecker: improper use of skip. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375336 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 00:00:33 +00:00
Aaron Myers
643608ea57 HDFS-3823. QJM: TestQJMWithFaults fails occasionally because of missed setting of HTTP port. Contributed by Todd Lipcon and Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1375323 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 23:44:14 +00:00
Tsz-wo Sze
b0ea77303b HADOOP-8240. Add a new API to allow users to specify a checksum type on FileSystem.create(..). Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374696 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 05:46:57 +00:00
Suresh Srinivas
086c855198 HDFS-3816. Invalidate work percentage default value should be 0.32f. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374645 13f79535-47bb-0310-9956-ffa450edef68
2012-08-18 19:50:15 +00:00
Eli Collins
18c5bc86ca HADOOP-8689. Make trash a server side configuration option. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374472 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 23:22:17 +00:00
Aaron Myers
fccace6116 HDFS-3672. Expose disk-location information for blocks to enable better scheduling. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374355 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 16:52:07 +00:00
Daryn Sharp
8fa10b184e HADOOP-7967. Need generalized multi-token filesystem support (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374271 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 14:05:11 +00:00
Tsz-wo Sze
ffbadbdd36 HDFS-2421. Improve the concurrency of SerialNumberMap in NameNode. Contributed by Jing Zhao and Weiyan Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374127 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 01:54:16 +00:00
Tsz-wo Sze
87d87b04e6 HDFS-3788. ByteRangeInputStream should not expect HTTP Content-Length header when chunked transfer-encoding is used.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374122 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 01:42:35 +00:00
Aaron Myers
bbe4584ebf HDFS-3808. fuse_dfs: postpone libhdfs intialization until after fork. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374106 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 23:47:33 +00:00
Eli Collins
cf93dfba4e HDFS-2963. Console Output is confusing while executing metasave (dfsadmin command). Contributed by Andrew Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374040 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 20:35:50 +00:00
Eli Collins
4524655afd HDFS-3194. DataNode block scanner is running too frequently. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373928 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 17:13:13 +00:00
Tsz-wo Sze
3cab01ba6e HADOOP-8700. Use enum to define the checksum constants in DataChecksum.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373683 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 01:32:10 +00:00
Eli Collins
f75deca0f9 HDFS-3048. Small race in BlockManager#close. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373664 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 22:43:01 +00:00
Todd Lipcon
5789de83a7 HDFS-3800. improvements to QJM fault testing. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373587 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:18:57 +00:00
Thomas White
4e09b481e7 HADOOP-8278. Make sure components declare correct set of dependencies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373574 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:10:52 +00:00
Todd Lipcon
d5abe22844 Merge trunk into branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373573 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:04:24 +00:00
Todd Lipcon
42cdc1b083 HDFS-3797. QJM: add segment txid as a parameter to journal() RPC. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373571 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 18:58:51 +00:00
Todd Lipcon
89153a9c68 HDFS-3796. Speed up edit log tests by avoiding fsync(). Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373567 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 18:53:13 +00:00
Tsz-wo Sze
9dff7876d9 HDFS-3802. StartupOption.name in HdfsServerConstants should be final. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373253 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 08:07:29 +00:00
Tsz-wo Sze
f41497c141 HDFS-3794. WebHDFS OPEN returns the incorrect Content-Length in the HTTP header when offset is specified and length is omitted. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373193 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 02:23:21 +00:00
Todd Lipcon
c95a1674b6 HDFS-3799. QJM: handle empty log segments during recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373183 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:57:24 +00:00
Todd Lipcon
4a9b3c693d HDFS-3798. Avoid throwing NPE when finalizeSegment() is called on invalid segment. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373179 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:54:49 +00:00
Todd Lipcon
160bfcd6c2 HDFS-3795. QJM: validate journal dir at startup. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373178 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:52:24 +00:00
Todd Lipcon
f765fdb657 HDFS-3793. Implement genericized format() in QJM. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373177 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:48:11 +00:00
Suresh Srinivas
6c96039693 HDFS-3803. Change BlockPoolSliceScanner chatty INFO log to DEBUG. Contributed by Andrew Purtell
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373174 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:33:53 +00:00
Suresh Srinivas
28e87740c5 HDFS-3723. Add support -h, -help to all the commands. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373173 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:28:41 +00:00
Suresh Srinivas
231a52a7df Reverting previous incomplete change r1373170 for HDFS-3723
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373172 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:25:07 +00:00
Suresh Srinivas
f026d8bb1b HDFS-3723. Add support -h, -help to all the commands. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373170 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:03:19 +00:00
Eli Collins
f98d8eb291 HDFS-3150. Add option for clients to contact DNs via hostname. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373094 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:59:54 +00:00
Daryn Sharp
f46b6ea55c HDFS-3718. Datanode won't shutdown because of runaway DataBlockScanner thread (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373090 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:56:49 +00:00
Todd Lipcon
b38bd555e8 HDFS-3765. namenode -initializeSharedEdits should be able to initialize all shared storages. Contributed by Vinay and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373061 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:11:40 +00:00
Tsz-wo Sze
0c27c77080 HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372707 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 03:02:43 +00:00
Todd Lipcon
ab3ab17a43 HDFS-3792. Fix two findbugs introduced by HDFS-3695. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372690 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 00:52:10 +00:00
Aaron Myers
4139298b61 HDFS-3790. test_fuse_dfs.c doesn't compile on centos 5. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372676 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 00:04:55 +00:00
Todd Lipcon
4b67401565 Merge trunk into branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1372630 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:31:44 +00:00
Todd Lipcon
c93185df66 HDFS-3276. initializeSharedEdits should have a -nonInteractive flag. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372628 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:26:39 +00:00
Todd Lipcon
c9ed8342f5 Move HDFS-2330 and HDFS-3190 to branch-2 section, since they have been backported from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372605 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 20:52:17 +00:00
Todd Lipcon
7aacfd5a08 HDFS-3789. JournalManager#format() should be able to throw IOException. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372566 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 19:36:31 +00:00
Aaron Myers
bbe0e823db Revert HDFS-3719. See discussion there and HDFS-3770 for more info.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372544 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 18:42:51 +00:00
Eli Collins
bcb715459c HDFS-3758. TestFuseDFS test failing. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371555 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 03:42:36 +00:00
Alejandro Abdelnur
4bca22005f HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371525 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 22:52:56 +00:00
Todd Lipcon
302f1e96ce Merge trunk into branch.
Branch will not build after this commit: need to implement new JournalManager
interfaces in QuorumJournalManager in a follow-up.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1371518 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 22:29:36 +00:00
Todd Lipcon
9d0f8792a9 HDFS-3695. Genericize format() to non-file JournalManagers. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 22:13:54 +00:00
Todd Lipcon
0733adf670 HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM on ARM. Contributed by Trevor Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371507 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:58:21 +00:00
Aaron Myers
9ea7c06468 HDFS-3721. hsync support broke wire compatibility. Contributed by Todd Lipcon and Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371495 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:31:12 +00:00
Aaron Myers
fb970f3df7 HDFS-3634. Add self-contained, mavenized fuse_dfs test. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371231 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 14:44:05 +00:00
Jakob Homan
ac31ae6a79 HDFS-3768. Exception in TestJettyHelper is incorrect. Contributed by Eli Reisman.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370952 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:34:03 +00:00
Todd Lipcon
6dcf2e4815 HDFS-3755. Creating an already-open-for-write file with overwrite=true fails. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370937 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:15:40 +00:00
Aaron Myers
b587af4631 HDFS-3710. libhdfs misuses O_RDONLY/WRONLY/RDWR. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370898 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 19:11:30 +00:00
Aaron Myers
bc88c7b043 HDFS-3773. TestNNWithQJM fails after HDFS-3741. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1370846 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 17:21:27 +00:00
Aaron Myers
34554d1e11 HDFS-3760. primitiveCreate is a write, not a read. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370649 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 02:53:56 +00:00
Todd Lipcon
3a53ef4a80 HDFS-3741. Exhaustive failure injection test for skipped RPCs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1370497 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 20:24:01 +00:00
Eli Collins
c12e994eda HDFS-3754. BlockSender doesn't shutdown ReadaheadPool threads. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370495 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 20:17:59 +00:00
Alejandro Abdelnur
754fd7b2fb HDFS-3291. add test that covers HttpFS working w/ a non-HDFS Hadoop filesystem (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370387 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 17:43:32 +00:00
Aaron Myers
9b4a7900c7 HDFS-3637. Add support for encrypting the DataTransferProtocol. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370354 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 16:40:03 +00:00
Aaron Myers
b4545bf5aa Add two new files missed by last commit of HDFS-3579.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370017 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 21:04:33 +00:00
Aaron Myers
f7b37c009b HDFS-3579. libhdfs: fix exception handling. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370015 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 21:02:30 +00:00
Aaron Myers
294b514596 HDFS-3719. Re-enable append-related tests in TestFileConcurrentReader. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1369848 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 13:59:00 +00:00
Alejandro Abdelnur
42d071ab6f HDFS-3756. DelegationTokenFetcher creates 2 HTTP connections, the second one not properly configured. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368733 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 22:10:51 +00:00
Alejandro Abdelnur
08e8966217 HDFS-3724. add InterfaceAudience annotations to HttpFS classes and making inner enum static. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368308 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 23:14:08 +00:00
Alejandro Abdelnur
fe17d871d0 HDFS-3513. HttpFS should cache filesystems. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368304 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 23:09:19 +00:00
Eli Collins
ade55f9573 HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368257 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 21:28:49 +00:00
Eli Collins
1264b8e707 HADOOP-8620. Add -Drequire.fuse and -Drequire.snappy. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368251 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 21:23:10 +00:00
Aaron Myers
8ea7112595 HDFS-3738. TestDFSClientRetries#testFailuresArePerOperation sets incorrect timeout config. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367844 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 02:16:57 +00:00
Tsz-wo Sze
cb787968c5 HDFS-3667. Add retry support to WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367841 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 01:41:23 +00:00
Tsz-wo Sze
556be2af92 svn merge -c -1366601 for reverting HDFS-3667.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367407 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 04:33:59 +00:00
Todd Lipcon
e08604907c HDFS-3725. Fix QJM startup when individual JNs have gaps. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1367366 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 23:35:22 +00:00
Todd Lipcon
e1dff3df99 Merge trunk into QJM branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1367365 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 23:31:42 +00:00
Robert Joseph Evans
48a2e2b4e2 HADOOP-8550. hadoop fs -touchz automatically created parent directories (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367202 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 18:11:32 +00:00
Aaron Myers
aeade62b95 HDFS-3732. fuse_dfs: incorrect configuration value checked for connection expiry timer period. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367199 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 18:07:07 +00:00
Tsz-wo Sze
e4eec269d9 HDFS-3667. Add retry support to WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366601 13f79535-47bb-0310-9956-ffa450edef68
2012-07-28 05:57:47 +00:00
Suresh Srinivas
0c4e670eff HDFS-3679. fuse_dfs notrash option sets usetrash. Contributed by Conrad Meyer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366545 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 21:51:07 +00:00
Daryn Sharp
cbd59c1c50 HDFS-3553. Hftp proxy tokens are broken (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366471 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 18:02:56 +00:00
Daryn Sharp
b3b72482e4 HADOOP-8613. AbstractDelegationTokenIdentifier#getUser() should set token auth type. (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366440 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 16:39:51 +00:00
Aaron Myers
c1ea9b4490 HDFS-3650. Use MutableQuantiles to provide latency histograms for various operations. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366246 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 00:26:21 +00:00
Alejandro Abdelnur
c5fe08e0ea HDFS-3113 amendment, removing incorrectly committed files
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365990 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:42:26 +00:00