Commit Graph

396 Commits

Author SHA1 Message Date
Eli Collins
ab20dae519 HDFS-2303. Unbundle jsvc. Contributed by Roman Shaposhnik and Mingjie Lai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299963 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 03:38:57 +00:00
Uma Maheswara Rao G
42900bd080 HADOOP-7900. LocalDirAllocator confChanged() accesses conf.get() twice. Contributed by Ravi Gummadi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1299434 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 19:23:45 +00:00
Uma Maheswara Rao G
3c373405e0 HADOOP-8146. FsShell commands cannot be interrupted. Contributed by Daryn Shar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298976 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 18:48:35 +00:00
Eli Collins
07c3b02281 HADOOP-7806. Support binding to sub-interfaces. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298700 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 04:43:06 +00:00
Eli Collins
d8cc362350 HADOOP-8154. DNS#getIPs shouldn't silently return the local host IP for bogus interface names. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298696 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 03:51:15 +00:00
Todd Lipcon
0aeed92a75 HADOOP-8141. Add method to SecurityUtil to init krb5 cipher suites. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298036 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 18:42:53 +00:00
Robert Joseph Evans
bb86825d49 HADOOP-8140. dfs -getmerge should process its argments better (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1297771 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 22:44:26 +00:00
Aaron Myers
26cd2356e0 HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. Contributed by Henry Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296556 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 02:02:23 +00:00
Aaron Myers
ffa527138b Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296485 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 21:43:28 +00:00
Robert Joseph Evans
97d104767d HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296386 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:03:05 +00:00
Todd Lipcon
87d1c67944 Merge trunk into HA branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296025 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 01:48:32 +00:00
Aaron Myers
7be4e5bd22 HDFS-3039. Address findbugs and javadoc warnings on branch. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296017 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 01:32:49 +00:00
Tsz-wo Sze
b2f67b4704 HADOOP-8124, HDFS-3034, MAPREDUCE-3956. Remove the deprecated Syncable.sync().
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295999 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 23:51:19 +00:00
Todd Lipcon
1d3a0c9557 Fix two more issues from trunk merge just committed -- removal of VersionedProtocol
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295349 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 00:08:13 +00:00
Todd Lipcon
1ba357553a Merge trunk into HA branch.
Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk.
Resolved some conflicts around removal of VersionedProtocol, etc.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295342 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 23:47:49 +00:00
Sanjay Radia
7ae04652a6 HADOOP-7557 Make IPC header be extensible (sanjay radia)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295261 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 20:43:21 +00:00
Tsz-wo Sze
2249e004d0 HADOOP-8118. In metrics2.util.MBeans, change log level to trace for the stack trace of InstanceAlreadyExistsException.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295240 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 19:57:43 +00:00
Harsh J
e478bc4384 HADOOP-7940. The Text.clear() method does not clear the bytes as intended. Contributed by Csaba Miklos.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295061 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 10:52:22 +00:00
Jitendra Nath Pandey
271654c6f5 HADOOP-7994. Remove getProtocolVersion and getProtocolSignature from the client side translator and server side implementation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295016 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 08:52:21 +00:00
Aaron Myers
978a8050e2 HDFS-2920. fix remaining TODO items. Contributed by Aaron T. Myers and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294923 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 01:09:07 +00:00
Aaron Myers
375c6b8f2e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1294762 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:33:41 +00:00
Alejandro Abdelnur
e43656c711 HADOOP-8098. KerberosAuthenticatorHandler should use _HOST replacement to resolve principal name (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294757 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:26:53 +00:00
Aaron Myers
328702891e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1293279 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 14:49:38 +00:00
Jitendra Nath Pandey
584a1ca1f7 HADOOP-8108. Move method getHostPortString() from NameNode to NetUtils. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293128 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 08:16:40 +00:00
Suresh Srinivas
22d5944c42 HADOOP-8085. Add RPC metrics to ProtobufRpcEngine. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1293071 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 04:05:39 +00:00
Aaron Myers
60ab29759e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1291893 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 16:24:40 +00:00
Devaraj Das
ae7e43139d HADOOP-8084. Updates ProtoBufRpc engine to not do an unnecessary copy for RPC request/response. Contributed by Devaraj Das.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1291602 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 05:19:53 +00:00
Aaron Myers
f0db867292 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1291400 13f79535-47bb-0310-9956-ffa450edef68
2012-02-20 18:33:37 +00:00
Matthew Foley
def0ac8060 HADOOP-8050. Deadlock in metrics. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1291084 13f79535-47bb-0310-9956-ffa450edef68
2012-02-19 22:45:12 +00:00
Steve Loughran
145338bc44 HADOOP-7680 TestHardLink fails on Mac OS X, when gnu stat is in path.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1290868 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 21:05:06 +00:00
Steve Loughran
2147427bd2 HADOOP-8057 hadoop-setup-conf.sh not working because of some extra spaces.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1290859 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 20:41:35 +00:00
Steve Loughran
3f8d7dbde3 HADOOP-8046 Revert StaticMapping semantics to the existing ones, add DNS mapping diagnostics in progress
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245911 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 12:57:49 +00:00
Aaron Myers
53b7d6c6bc Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245690 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 18:19:31 +00:00
Robert Joseph Evans
1425c65b5e HADOOP-8054. NPE with FilterFileSystem (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245637 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 16:27:27 +00:00
Aaron Myers
7933dc5838 HDFS-2586. Add protobuf service and implementation for HAServiceProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245338 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 07:37:43 +00:00
Aaron Myers
833e96534f Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245117 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 18:35:32 +00:00
Eli Collins
1ceb0eeaf4 HADOOP-8074. Small bug in hadoop error message for unknown commands. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244766 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:23:20 +00:00
Aaron Myers
1fb0ab92f8 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244645 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 19:04:17 +00:00
Todd Lipcon
cdc8146bd4 HADOOP-8068. void methods can swallow exceptions when going through failover path. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244628 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:20:11 +00:00
Todd Lipcon
063be5749d HADOOP-6502. Improve the performance of Configuration.getClassByName when the class is not found by caching negative results. Contributed by Sharad Agarwal and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244620 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:10:21 +00:00
Alejandro Abdelnur
89bd2210a7 MAPREDUCE-3736. Variable substitution depth too large for fs.default.name causes jobs to fail (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244264 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:09:05 +00:00
Aaron Myers
011611c765 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244202 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 20:37:10 +00:00
Todd Lipcon
f42e58c381 HADOOP-8071. Avoid an extra packet in client code when nagling is disabled. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244189 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 19:47:02 +00:00
Todd Lipcon
82ffe0e732 HADOOP-8070. Add a standalone benchmark for RPC call performance. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244185 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 19:29:42 +00:00
Todd Lipcon
db187cf40e Merge trunk into HA branch.
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243691 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 21:00:37 +00:00
Matthew Foley
00ee0585ab HADOOP-8052. Hadoop Metrics2 should emit Float.MAX_VALUE (instead of Double.MAX_VALUE) to avoid making Ganglia's gmetad core. Contributed by Varun Kapoor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243207 13f79535-47bb-0310-9956-ffa450edef68
2012-02-12 07:47:35 +00:00
Harsh J
6bec4035bd HADOOP-8055. Hadoop tarball distribution lacks a core-site.xml (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243065 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 14:10:04 +00:00
Todd Lipcon
a626fa04f9 Revert HDFS-2922 via svn merge -c -1242572
The patch broke a lot of unit tests in the nightly build. Will recommit after it is fixed.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242874 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 18:17:21 +00:00
Todd Lipcon
c14bb61a82 Merge trunk into HA branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242635 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 01:49:08 +00:00
Eli Collins
8af96c7b22 HDFS-2917. HA: haadmin should not work if run by regular user. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242626 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 00:46:17 +00:00
Thomas Graves
2a2faac0de HADOOP-8048. Allow merging of Credentials (Daryn Sharp via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242616 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 00:17:49 +00:00
Eli Collins
a63e12c4c8 HDFS-2922. HA: close out operation categories. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242572 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 22:33:20 +00:00
Todd Lipcon
1b4c990b61 HADOOP-8041. Log a warning when a failover is first attempted. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242441 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 18:25:44 +00:00
Todd Lipcon
5e26de982b HDFS-2924. Standby checkpointing fails to authenticate in secure cluster. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242439 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 18:22:02 +00:00
Robert Joseph Evans
7f7b05226e HADOOP-8042. When copying a file out of HDFS, modifying it, and uploading it back into HDFS, the put fails due to a CRC mismatch (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242389 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 16:41:44 +00:00
Todd Lipcon
e918b91e23 HDFS-2579. Starting delegation token manager during safemode fails. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242225 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 06:12:01 +00:00
Aaron Myers
da10820fe5 HADOOP-8038. Add 'ipc.client.connect.max.retries.on.timeouts' entry in core-default.xml file. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242017 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 17:57:36 +00:00
Aaron Myers
2d1406e9e7 HADOOP-8027. Visiting /jmx on the daemon web interfaces may print unnecessary error in logs. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241303 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 01:09:34 +00:00
Eli Collins
c17b4f8eef HDFS-2819. Document new HA-related configs in hdfs-default.xml. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240914 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:21:06 +00:00
Eli Collins
7b913180be HDFS-2808. HA: haadmin should use namenode ids. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240600 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 20:12:51 +00:00
Aaron Myers
ec6961b39c HDFS-2792. Make fsck work. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1240449 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 03:10:39 +00:00
Robert Joseph Evans
da00476fca HADOOP-8013 ViewFileSystem does not honor setVerifyChecksum (Dayrn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240383 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 22:55:52 +00:00
Robert Joseph Evans
7e8bf2c7ee HADOOP-8015 ChRootFileSystem should extend FilterFileSystem (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239924 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 23:24:04 +00:00
Eli Collins
4324e1bcd7 HADOOP-7991. HA: the FailoverController should check the standby is ready before failing over. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1239774 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:20:32 +00:00
Eli Collins
1950f97ab9 HADOOP-8012. hadoop-daemon.sh and yarn-daemon.sh are trying to mkdir and chown log/pid dirs which can fail. Contributed by Roman Shaposhnik
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239752 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 18:45:07 +00:00
Robert Joseph Evans
58ba16e85f HADOOP-8001 ChecksumFileSystem's rename doesn't correctly handle checksum files (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239727 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 17:12:44 +00:00
Mahadev Konar
947ede4c4e MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239310 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 20:43:10 +00:00
Robert Joseph Evans
f8a245c273 HADOOP-8006 TestFSInputChecker is failing in trunk. (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238841 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 22:40:25 +00:00
Eli Collins
6884348444 HADOOP-7938. HA: the FailoverController should optionally fence the active during failover. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238058 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 22:42:46 +00:00
Eli Collins
5c156519df HADOOP-7983. HA: failover should be able to pass args to fencers. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1238049 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 22:27:42 +00:00
Mahadev Konar
e6ca182a26 HADOOP-7999. "hadoop archive" fails with ClassNotFoundException. (Jason Lowe via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237915 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 18:33:11 +00:00
Aaron Myers
6122357da5 HDFS-2841. HAAdmin does not work if security is enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237534 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 02:52:27 +00:00
Aaron Myers
30dd704e6c Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1237157 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 20:33:30 +00:00
Mahadev Konar
934047630a HADOOP-8002. SecurityUtil acquired token message should be a debug rather than info. (Arpit Gupta via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236976 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 04:05:19 +00:00
Todd Lipcon
327c216c2f Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236965 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 02:50:23 +00:00
Jitendra Nath Pandey
ed6a73140e HADOOP-7988. Upper case in hostname part of the principals doesn't work with kerberos.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236960 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 02:24:08 +00:00
Aaron Myers
2b2e56056e Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236936 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:21:07 +00:00
Alejandro Abdelnur
8a234f394e HADOOP-7939. Improve Hadoop subcomponent integration in Hadoop 0.23. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236929 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 23:53:35 +00:00
Mahadev Konar
5d15e5640e HADOOP-8000. fetchdt command not available in bin/hadoop. (Arpit Gupta via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236921 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 23:15:57 +00:00
Robert Joseph Evans
cc8a2a29f1 HADOOP-7998 CheckFileSystem does not correctly honor setVerifyChecksum (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236911 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 22:42:47 +00:00
Mahadev Konar
c8bb6f59b8 HADOOP-7993. Hadoop ignores old-style config options for enabling compressed output. (Anupam Seth via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236506 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 03:42:36 +00:00
Eli Collins
c5caed914d HADOOP-7997. SequenceFile.createWriter(...createParent...) no longer works on existing file. Contributed by Gregory Chanan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236456 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 00:09:10 +00:00
Jitendra Nath Pandey
12289efa2b HADOOP-7965. Support for protocol version and signature in PB.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236444 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 23:23:03 +00:00
Aaron Myers
1c95060a72 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236333 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:03:46 +00:00
Jitendra Nath Pandey
a00640a3db HADOOP-7987. Support setting the run-as user in unsecure mode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235945 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 21:02:47 +00:00
Suresh Srinivas
cbfe8fea0e HADOOP-7992. Add ZKClient library to facilitate leader election. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235841 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 17:26:20 +00:00
Jitendra Nath Pandey
0b2245a0f3 HDFS-2807. Service level authorizartion for HAServiceProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235431 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 19:31:49 +00:00
Aaron Myers
83bcb1bbf4 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235380 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 17:59:14 +00:00
Eli Collins
5dfe62d845 HDFS-2397. Undeprecate SecondaryNameNode. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 06:05:52 +00:00
Todd Lipcon
fa4a33a566 Merge trunk into HA branch.
- Some conflicts on BlockManager due to the recent commit of HDFS-2822 - moved logic to processMisReplicatedBlock function
- testNoExtensionIfNoBlocks(org.apache.hadoop.hdfs.TestSafeMode) is now failing due to an existing bug in the HA branch, to be fixed soon 


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1235078 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 00:00:05 +00:00
Mahadev Konar
f07d91a1fc HADOOP-7981. Improve documentation for org.apache.hadoop.io.compress.Decompressor.getRemaining (Jonathan Eagles via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235007 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:44:49 +00:00
Aaron Myers
e42bbfbca2 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234924 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 18:07:27 +00:00
Vinod Kumar Vavilapalli
959d1d0181 HADOOP-7986. Adding config for MapReduce History Server protocol in hadoop-policy.xml for service level authorization. Contributed by Mahadev Konar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234097 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:49:05 +00:00
Aaron Myers
2abe5c818d Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234087 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:30:53 +00:00
Todd Lipcon
b7eb5334f5 HADOOP-7982. UserGroupInformation fails to login if thread's context classloader can't load HadoopLoginModule. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233751 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 03:33:50 +00:00
Aaron Myers
6177bf6c8f Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233105 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 23:02:17 +00:00
Arun Murthy
5ffff3aea9 HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for backward compatibility. Contributed by Prashath Sharma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232322 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 06:56:52 +00:00
Todd Lipcon
212678f036 HDFS-2767. ConfiguredFailoverProxyProvider should support NameNodeProtocol. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232284 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 03:10:25 +00:00
Aaron Myers
940eeb866c Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1232184 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 21:57:28 +00:00
Harsh J
a9002bfea1 HADOOP-7968. Errant println left in RPC.getHighestSupportedProtocol (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231732 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 19:15:04 +00:00
Harsh J
69290d383c HADOOP-7975. Add LZ4 as an entry in the default codec list, missed by HADOOP-7657 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231627 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 05:18:59 +00:00
Suresh Srinivas
72207596be HADOOP-7972. HAServiceProtocol exceptions need to be unwrapped. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230861 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 02:30:29 +00:00
Aaron Myers
8610a9231a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230696 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 18:40:50 +00:00
Suresh Srinivas
09e5af76f3 HADOOP-7970. HAServiceProtocol methods must throw IOException.Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230351 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 01:39:30 +00:00
Suresh Srinivas
8f83a2355b HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230249 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 21:02:04 +00:00
Aaron Myers
ede7f21278 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1230248 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 20:53:50 +00:00
Todd Lipcon
44d070cd01 HDFS-2724. NN web UI can throw NPE after startup, before standby state is entered. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1229466 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 03:46:05 +00:00
Vinod Kumar Vavilapalli
8feb26f116 HADOOP-7963. Fix ViewFS to catch a null canonical service-name and pass tests TestViewFileSystem* (Siddharth Seth via vinodkv)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229379 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 21:52:53 +00:00
Eli Collins
fcf1039cdc Previous commit didn't fixup package statements.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228561 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 03:29:35 +00:00
Eli Collins
2d0b340c47 HADOOP-7961. Move HA fencing to common. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228510 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 00:17:42 +00:00
Aaron Myers
d680080da0 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228339 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 18:47:05 +00:00
Thomas White
a878bea3fe HADOOP-7937. Forward port SequenceFile#syncFs and friends from Hadoop 1.x.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228291 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 17:24:55 +00:00
Harsh J
574f0b4c0a HADOOP-4515. Configuration#getBoolean must not be case sensitive. (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227964 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 05:42:24 +00:00
Aaron Myers
20af88280a Fix bad merge which mixed up two configuration options.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227962 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 05:37:24 +00:00
Jitendra Nath Pandey
a230d19d99 HADOOP-7957. Classes deriving GetGroupsBase should be able to override proxy creation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227861 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:56:47 +00:00
Eli Collins
fb9cdcfa60 HADOOP-7924. 
FailoverController for client-based configuration. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227836 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:02:59 +00:00
Aaron Myers
3187a3ae05 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227775 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:21:01 +00:00
Suresh Srinivas
4bb572d336 HADOOP-7808. Port HADOOP-7510 - Add configurable option to use original hostname in token instead of IP to allow server IP change. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227737 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:41:59 +00:00
Eli Collins
85c4158074 HADOOP-7949. Updated maxIdleTime default in the code to match core-default.xml. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227423 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:31:14 +00:00
Aaron Myers
cd81cc6664 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1227260 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 18:47:51 +00:00
Harsh J
075122690c HDFS-1314. Make dfs.blocksize accept size-indicating prefixes (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227165 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 14:15:15 +00:00
Siddharth Seth
7ee3e072b8 HADOOP-7933. Add a getDelegationTokens api to FileSystem which checks for known tokens in the passed Credentials object. (sseth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226916 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 18:58:57 +00:00
Aaron Myers
1423fff096 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1226900 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 18:07:55 +00:00
Harsh J
5f15c292dc HADOOP-7504. Add the missing Ganglia31 opts to hadoop-metrics.properties as a comment. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226351 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 06:30:20 +00:00
Harsh J
36a2d57f07 HADOOP-7919. Remove the unused hadoop.logfile.* properties from the core-default.xml file. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226350 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 06:26:40 +00:00
Harsh J
11905517f1 HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226211 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 03:11:48 +00:00
Aaron Myers
f216303598 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 18:25:48 +00:00
Harsh J
07027b80f3 HADOOP-7910. Add Configuration.getLongBytes to handle human readable byte size values. (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225489 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 10:27:14 +00:00
Aaron Myers
d619dee4ed Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225264 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:37:22 +00:00
Harsh J
1e0c51c66e HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225192 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 14:30:19 +00:00
Harsh J
9eb87574a3 HADOOP-7574. Improve FSShell -stat, add user/group elements (XieXianshan via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225114 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 06:48:31 +00:00
Aaron Myers
a500ba50c2 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1224965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:18:36 +00:00
Alejandro Abdelnur
ae0d48854d HDFS-2707. HttpFS should read the hadoop-auth secret from a file instead inline from the configuration. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224794 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 19:37:25 +00:00
Mahadev Konar
55ad01711e HADOOP-7890. Redirect hadoop script's deprecation message to stderr. (Koji Knoguchi via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221849 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 19:34:09 +00:00
Eli Collins
f9b2197d2a HADOOP-7837. no NullAppender in the log4j config. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221348 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 17:17:26 +00:00
Todd Lipcon
009dfed8d7 HADOOP-7932. Make client connection retries on socket time outs configurable. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220957 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 21:32:55 +00:00
Todd Lipcon
8ff28f4549 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:34:51 +00:00
Todd Lipcon
45e81ae415 HADOOP-7925. Add interface and update CLI to query current state to HAServiceProtocol. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220611 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:21:24 +00:00
Todd Lipcon
191b56d802 HADOOP-7657. Add support for LZ4 compression. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220314 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 00:54:18 +00:00
Aaron Myers
08c9dc3780 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:31:46 +00:00
Aaron Myers
059290ce3a HADOOP-7931. o.a.h.ipc.WritableRpcEngine should have a way to force initialization. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215358 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:14:36 +00:00
Mahadev Konar
6d551b83de MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215065 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:09:28 +00:00
Aaron Myers
116bf57bd6 HADOOP-7928. HA: Client failover policy is incorrectly trying to fail over all IOExceptions. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215019 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 01:54:44 +00:00
Todd Lipcon
b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:34:04 +00:00
Suresh Srinivas
d9c9fb913e HADOOP-7920. Remove Avro Rpc. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214114 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:45:59 +00:00
Todd Lipcon
d5a658e7a4 HADOOP-7921. StandbyException should extend IOException. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214093 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:10:34 +00:00
Todd Lipcon
9cf3e0805f HADOOP-7922. Improve some logging for client IPC failovers and StandbyExceptions. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214082 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:51:30 +00:00
Aaron Myers
9818091a66 HADOOP-7896. HA: if both NNs are in Standby mode, client needs to try failing back and forth several times with sleeps. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:24:36 +00:00
Todd Lipcon
fac14e799a HADOOP-7892. IPC logs too verbose after "RpcKind" introduction. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213954 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 21:59:34 +00:00
Alejandro Abdelnur
0201be46c2 HADOOP-7810. move hadoop archive to core from tools. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213907 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:17:59 +00:00