Robert Joseph Evans
|
ca4b6ee8c6
|
Reverted MAPREDUCE-4974 because of test failures.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
|
2013-04-02 02:15:08 +00:00 |
Robert Joseph Evans
|
f47bdbded7
|
svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68
|
2013-04-01 17:47:19 +00:00 |
Bikas Saha
|
ad1695cb1e
|
Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-28 19:48:52 +00:00 |
Thomas White
|
b1c781b2be
|
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-27 11:42:32 +00:00 |
Thomas Graves
|
0f66ba0b50
|
MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed. (Ravi Gummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461296 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 20:10:04 +00:00 |
Thomas Graves
|
257b263802
|
MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461289 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 19:54:51 +00:00 |
Thomas Graves
|
922c8ff997
|
MAPREDUCE-4356. [Rumen] Provide access to the method ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461277 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 19:26:36 +00:00 |
Thomas Graves
|
291a20960b
|
MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map only jobs. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461275 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 19:21:43 +00:00 |
Thomas Graves
|
8f43934e99
|
MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461272 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 19:08:26 +00:00 |
Thomas Graves
|
e9440d688e
|
MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running tasks in Gridmix. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461269 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 19:00:53 +00:00 |
Siddharth Seth
|
6e9e2f0c7f
|
MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 18:18:44 +00:00 |
Thomas Graves
|
57f91f9541
|
MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461243 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 18:00:30 +00:00 |
Thomas Graves
|
288393399a
|
MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the trace contains null taskStatus for a task. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461242 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 17:52:40 +00:00 |
Thomas Graves
|
67b93ebb23
|
MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter is wrong when compressed input is used.(ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461236 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 17:42:29 +00:00 |
Thomas Graves
|
1f988b777c
|
MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input data directory already exists and -generate opton is erate opton is
+ given.(ravi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461233 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 17:29:26 +00:00 |
Thomas Graves
|
9a217a56dc
|
MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster job submission. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461212 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 16:35:58 +00:00 |
Robert Joseph Evans
|
4bc46b766d
|
svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-26 14:17:59 +00:00 |
Vinod Kumar Vavilapalli
|
7410551629
|
MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1460923 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-25 22:34:45 +00:00 |
Hitesh Shah
|
c983b07753
|
MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459935 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-22 19:14:07 +00:00 |
Siddharth Seth
|
7892e1aabd
|
merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-21 21:57:12 +00:00 |
Hitesh Shah
|
1de797794e
|
merge -c 1459040 from trunk to branch-2 to fix YARN-396. Rationalize AllocateResponse in RM Scheduler API. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459044 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-20 20:46:22 +00:00 |
Robert Joseph Evans
|
05fabc2013
|
svn merge -c 1458906 FIXES: MAPREDUCE-4972. Coverage fixing for org.apache.hadoop.mapreduce.jobhistory (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458915 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-20 16:11:58 +00:00 |
Tsz-wo Sze
|
aa874f3952
|
svn merge -c 1458749 from trunk for moving MAPREDUCE-5075 to 2.0.5-beta in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458753 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-20 10:49:54 +00:00 |
Tsz-wo Sze
|
84664ccde2
|
svn merge -c 1458741 from trunk for MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream does not close the wrapped InputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458747 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-20 10:43:21 +00:00 |
Alejandro Abdelnur
|
35bc29813f
|
Reverting MAPREDUCE-5028 (commit 1457919)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-19 18:00:38 +00:00 |
Jonathan Turner Eagles
|
3fdeec0bd3
|
MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-19 15:48:36 +00:00 |
Alejandro Abdelnur
|
1036f637cc
|
MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-18 18:59:22 +00:00 |
Alejandro Abdelnur
|
60fcbe2e05
|
MAPREDUCE-4990. Construct debug strings conditionally in ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457916 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-18 18:46:36 +00:00 |
Aaron Myers
|
eb6a563194
|
HDFS-4521. Invalid network toploogies should not be cached. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457883 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-18 17:26:45 +00:00 |
Robert Joseph Evans
|
9a9d40200f
|
svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-15 21:11:45 +00:00 |
Alejandro Abdelnur
|
3eeb720b2f
|
MAPREDUCE-4716. TestHsWebServicesJobsQuery.testJobsQueryStateInvalid fails with jdk7. (tgraves via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457068 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-15 18:58:21 +00:00 |
Alejandro Abdelnur
|
1a00fa6e3a
|
MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457063 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-15 18:51:22 +00:00 |
Robert Joseph Evans
|
3508e8e7dd
|
svn merge -c 1456536 FIXES: YARN-237. Refreshing the RM page forgets how many rows I had in my Datatables (jian he via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456537 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-14 16:57:10 +00:00 |
Jason Darrell Lowe
|
77e23898f1
|
svn merge -c 1455740 FIXES: MAPREDUCE-5060. Fetch failures that time out only count against the first map task. Contributed by Robert Joseph Evans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455742 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-12 22:56:57 +00:00 |
Thomas Graves
|
d46bbdd43f
|
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454157 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-07 23:03:10 +00:00 |
Arun Murthy
|
7808df2ed5
|
Preparing for 2.0.4-alpha bug-fix release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453888 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-07 14:23:26 +00:00 |
Arun Murthy
|
851a425b2a
|
Merge -c 1453365 from trunk to branch-2 to fix MAPREDUCE-3685. Fix bugs in MergeManager to ensure compression codec is appropriately used and that on-disk segments are correctly sorted on file-size. Contributed by Anty Rao and Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453367 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-06 15:03:29 +00:00 |
Jonathan Turner Eagles
|
ea7aa7f80f
|
MAPREDUCE-5027. Shuffle does not limit number of outstanding connections (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453099 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-06 00:07:25 +00:00 |
Robert Joseph Evans
|
611d6d543e
|
svn merge -c 1452372 FIXES: MAPREDUCE-5043. Fetch failure processing can cause AM event queue to backup and eventually OOM (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452451 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-04 19:06:26 +00:00 |
Jonathan Turner Eagles
|
a5985e4b0e
|
MAPREDUCE-4794. DefaultSpeculator generates error messages on normal shutdown (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451831 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-02 03:45:21 +00:00 |
Alejandro Abdelnur
|
6072cb98a9
|
MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue does not exist. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451453 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-01 01:28:50 +00:00 |
Alejandro Abdelnur
|
9db8505b19
|
HADOOP-9349. Confusing output when running hadoop version from one hadoop installation when HADOOP_HOME points to another. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451449 13f79535-47bb-0310-9956-ffa450edef68
|
2013-03-01 01:21:30 +00:00 |
Jonathan Turner Eagles
|
07680cdb13
|
MAPREDUCE-4871. AM uses mapreduce.jobtracker.split.metainfo.maxsize but mapred-default has mapreduce.job.split.metainfo.maxsize (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451319 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-28 19:57:10 +00:00 |
Siddharth Seth
|
b775d49f35
|
merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-27 21:04:29 +00:00 |
Vinod Kumar Vavilapalli
|
c3981d3f2c
|
MAPREDUCE-4892. Modify CombineFileInputFormat to not skew input slits' allocation on small clusters. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1450912 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450915 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-27 18:53:03 +00:00 |
Thomas White
|
7b943682fb
|
Merge -r 1450722:1450723 from trunk to branch-2. Fixes: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450724 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-27 10:40:52 +00:00 |
Aaron Myers
|
ba7b51eec1
|
MAPREDUCE-5033. mapred shell script should respect usage flags (--help -help -h). Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450585 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-27 02:43:27 +00:00 |
Suresh Srinivas
|
6485664b15
|
HADOOP-9334. Merge change 1450463 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-26 22:02:30 +00:00 |
Thomas White
|
96b3905afd
|
Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448618 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-21 12:04:46 +00:00 |
Thomas White
|
a9f552cb33
|
Merge -r 1448601:1448602 from trunk to branch-2. Fixes: MAPREDUCE-5013. mapred.JobStatus compatibility: MR2 missing constructors from MR1. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448604 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-21 11:44:50 +00:00 |
Thomas White
|
af07edf1ab
|
Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-21 11:36:26 +00:00 |
Jonathan Turner Eagles
|
e3afdf5aa9
|
MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear the value from the Task commitAttempt member (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1447969 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-19 23:42:40 +00:00 |
Alejandro Abdelnur
|
7f9b4c4e8b
|
MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-14 04:22:41 +00:00 |
Alejandro Abdelnur
|
1709c222d9
|
HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-14 01:36:47 +00:00 |
Siddharth Seth
|
d53d4cbca3
|
merge MAPREDUCE-5000 from trunk. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445873 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-13 19:23:50 +00:00 |
Jason Darrell Lowe
|
e3924c623f
|
svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-13 02:17:24 +00:00 |
Jason Darrell Lowe
|
a6f31c1d91
|
svn merge -c 1445448 FIXES: MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445450 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-13 01:21:58 +00:00 |
Alejandro Abdelnur
|
a6925b3fdd
|
MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-12 20:16:43 +00:00 |
Siddharth Seth
|
288dd9b025
|
merge MAPREDUCE-4671 from trunk. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443324 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-07 07:08:30 +00:00 |
Jason Darrell Lowe
|
2db13d61c2
|
svn merge -c 1443257 FIXES: MAPREDUCE-4822. Unnecessary conversions in History Events. Contributed by Chu Tong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443269 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-06 22:58:09 +00:00 |
Alejandro Abdelnur
|
f5503bd44a
|
MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-06 19:53:06 +00:00 |
Robert Joseph Evans
|
dcbad333ad
|
svn merge -c 1443027. FIXES: MAPREDUCE-4905. test org.apache.hadoop.mapred.pipes (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443033 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-06 15:57:46 +00:00 |
Arun Murthy
|
d898116ded
|
Preparing for hadoop-2.0.3-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442960 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-06 13:39:39 +00:00 |
Arun Murthy
|
196341fc09
|
Setting version to 2.0.4-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-06 13:23:45 +00:00 |
Aaron Myers
|
98678962c4
|
MAPREDUCE-4953. HadoopPipes misuses fprintf. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442472 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-05 04:54:28 +00:00 |
Robert Joseph Evans
|
54ce586b8d
|
svn merge -c r1427945 FIXES: MAPREDUCE-4884. Streaming tests fail to start MiniMRCluster due to missing queue configuration. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442174 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-04 16:54:43 +00:00 |
Siddharth Seth
|
392a96bd64
|
merge MAPREDUCE-4971 from trunk. Minor extensibility enhancements to Counters & FileOutputFormat. Contributed by Arun C Murthy
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441672 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-02 00:49:17 +00:00 |
Hitesh Shah
|
6eead06fa2
|
merge -c 1441668 from trunk to branch-2 to fix YARN-372. Move InlineDispatcher from hadoop-yarn-server-resourcemanager to hadoop-yarn-common. Contributed by Siddharth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441669 13f79535-47bb-0310-9956-ffa450edef68
|
2013-02-02 00:45:37 +00:00 |
Suresh Srinivas
|
a83b272a36
|
MAPREDUCE-4969. Merge change 1441069 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441070 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-31 17:17:21 +00:00 |
Vinod Kumar Vavilapalli
|
a11e8bef64
|
MAPREDUCE-4893. Fixed MR ApplicationMaster to do optimal assignment of containers to get maximum locality. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1440749 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440752 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-31 00:29:36 +00:00 |
Alejandro Abdelnur
|
1cc2fcd3b2
|
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440080 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-29 19:40:20 +00:00 |
Siddharth Seth
|
6f146b15d3
|
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-29 00:23:27 +00:00 |
Siddharth Seth
|
6431b24f04
|
merge MAPREDUCE-4803 from trunk. Remove duplicate copy of TestIndexCache. Contributed by Mariappan Asokan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439591 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-28 19:19:52 +00:00 |
Alejandro Abdelnur
|
26e597010f
|
Reverting MAPREDUCE-2264
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-28 18:59:32 +00:00 |
Alejandro Abdelnur
|
7ac9d3b1c5
|
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-26 00:50:17 +00:00 |
Alejandro Abdelnur
|
d8cdee8360
|
MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-26 00:41:12 +00:00 |
Alejandro Abdelnur
|
cf67cccd7c
|
MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-26 00:40:21 +00:00 |
Alejandro Abdelnur
|
7a6b9f3609
|
MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-26 00:39:27 +00:00 |
Alejandro Abdelnur
|
c4c039bb29
|
MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-26 00:38:38 +00:00 |
Siddharth Seth
|
b981b59c06
|
merge MAPREDUCE-4946 from trunk. Fix a performance problem for large jobs by reducing the number of map completion event type conversions. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437104 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-22 19:08:06 +00:00 |
Alejandro Abdelnur
|
b486f7e2de
|
MAPREDUCE-4949. Enable multiple pi jobs to run in parallel. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437030 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-22 16:28:36 +00:00 |
Jonathan Turner Eagles
|
361e05864f
|
svn merge -c 1435386 FIXES: MAPREDUCE-4458. Warn if java.library.path is used for AM or Task (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435394 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-18 22:47:14 +00:00 |
Siddharth Seth
|
f18bb1a150
|
merge MAPREDUCE-4948 from trunk. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435313 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-18 19:31:10 +00:00 |
Alejandro Abdelnur
|
1d6bd54e29
|
MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434994 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-18 00:41:26 +00:00 |
Thomas Graves
|
d5334e1571
|
Preparing for release 0.23.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434031 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-16 16:46:12 +00:00 |
Alejandro Abdelnur
|
2e2afd22f9
|
MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433759 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-16 00:15:59 +00:00 |
Siddharth Seth
|
44b3be14bc
|
merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-15 18:35:10 +00:00 |
Jason Darrell Lowe
|
3943008b07
|
svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-15 14:49:14 +00:00 |
Harsh J
|
0ab4e6984f
|
MAPREDUCE-4925. The pentomino option parser may be buggy. Contributed by Karthik Kambatla. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433416 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-15 13:55:49 +00:00 |
Harsh J
|
82f03491a6
|
MAPREDUCE-4678. Running the Pentomino example with defaults throws java.lang.NegativeArraySizeException. Contributed by Chris McConnell. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433412 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-15 13:47:53 +00:00 |
Suresh Srinivas
|
1b410df23f
|
MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-15 00:13:43 +00:00 |
Thomas Graves
|
fdc4c61101
|
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-14 15:01:35 +00:00 |
Robert Joseph Evans
|
63106e20e0
|
svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-11 19:05:02 +00:00 |
Alejandro Abdelnur
|
4774c6a5b8
|
MAPREDUCE-4907. Ammendment, forgot to svn add testcase in original commit
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431511 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-10 17:28:27 +00:00 |
Alejandro Abdelnur
|
572f7f45d6
|
MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-10 00:52:15 +00:00 |
Jason Darrell Lowe
|
fb0a8ff926
|
svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-09 23:01:11 +00:00 |
Thomas White
|
98cb5344eb
|
Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-09 16:22:55 +00:00 |
Vinod Kumar Vavilapalli
|
76939f2877
|
MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen.
svn merge --ignore-ancestry -c 1430707 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-09 06:33:01 +00:00 |
Arun Murthy
|
122cd0fb5b
|
Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-09 05:31:53 +00:00 |
Arun Murthy
|
b412841745
|
Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-09 05:17:31 +00:00 |
Thomas Graves
|
8c9b47c29e
|
MAPREDUCE-4899 fix branch-2 merge issue in pom
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430470 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-08 19:53:32 +00:00 |
Thomas White
|
75878f6c7b
|
Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-08 16:31:58 +00:00 |
Vinod Kumar Vavilapalli
|
9a87b2f7fe
|
MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
svn merge --ignore-ancestry -c 1429751 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-07 11:15:10 +00:00 |
Thomas Graves
|
b035a444e1
|
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-05 20:19:18 +00:00 |
Robert Joseph Evans
|
199df2b770
|
svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-04 20:38:36 +00:00 |
Thomas Graves
|
2cb090a075
|
MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-04 20:31:22 +00:00 |
Jason Darrell Lowe
|
ec4fc07c52
|
svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-04 19:27:56 +00:00 |
Robert Joseph Evans
|
6862511182
|
svn merge -c 1428482 FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
|
2013-01-03 17:21:27 +00:00 |
Robert Joseph Evans
|
52742c9a65
|
svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-28 15:06:15 +00:00 |
Jason Darrell Lowe
|
7bec80179b
|
svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-26 20:49:39 +00:00 |
Vinod Kumar Vavilapalli
|
121a79c7a1
|
MAPREDUCE-4899. Implemented a MR specific plugin for tracking finished applications that YARN's ResourceManager doesn't keep track off anymore. Contributed by Derek Dagit.
svn merge --ignore-ancestry -c 1425225 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425226 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-22 01:49:02 +00:00 |
Jason Darrell Lowe
|
5b6115e3bb
|
svn merge -c 1425223 FIXES: MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425224 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-22 01:46:05 +00:00 |
Jason Darrell Lowe
|
41ad080fd9
|
svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when using both -files and -file to hadoop streaming. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425181 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-21 23:12:44 +00:00 |
Luke Lu
|
307a46f6be
|
MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant. (Yu Gao via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425179 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-21 23:08:54 +00:00 |
Jason Darrell Lowe
|
043fd00a30
|
svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-21 22:34:41 +00:00 |
Jason Darrell Lowe
|
891e616d51
|
svn merge -c 1425071 FIXES: MAPREDUCE-4842. Shuffle race can hang reducer. Contributed by Mariappan Asokan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425074 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-21 18:32:57 +00:00 |
Thomas Graves
|
38750e6500
|
MAPREDUCE-4895 Fix compilation failure of org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424501 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-20 14:52:24 +00:00 |
Luke Lu
|
8636b12e35
|
YARN-223. Update process tree instead of getting new process trees. (Radim Kolar via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424242 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-20 00:19:40 +00:00 |
Thomas White
|
01c5d0eb77
|
Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-18 15:25:09 +00:00 |
Thomas White
|
fc70cd9538
|
Merge -r 1420633:1420634 from trunk to branch-2. Fixes: MAPREDUCE-4856. TestJobOutputCommitter uses same directory as TestJobCleanup. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420635 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-12 12:14:08 +00:00 |
Alejandro Abdelnur
|
1fce56fd24
|
MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-11 19:50:32 +00:00 |
Alejandro Abdelnur
|
680b437f2f
|
MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-11 19:29:18 +00:00 |
Jason Darrell Lowe
|
e2c0cf69ca
|
svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-11 15:51:12 +00:00 |
Alejandro Abdelnur
|
89b9fc3034
|
MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using the configurations used before it is being stopped. (ahmed.radwan via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419619 13f79535-47bb-0310-9956-ffa450edef68
|
2012-12-10 18:10:22 +00:00 |
Jonathan Turner Eagles
|
77933c6327
|
MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-30 21:51:38 +00:00 |
Thomas Graves
|
b432cf076e
|
merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414876 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-28 19:24:27 +00:00 |
Robert Joseph Evans
|
3e0d0cf08f
|
svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-28 17:54:10 +00:00 |
Robert Joseph Evans
|
ff97561e05
|
svn merge -c 1413739 FIXES: MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1413741 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-26 17:38:53 +00:00 |
Jason Darrell Lowe
|
6e6b09dfba
|
svn merge -c 1412377 FIXES: MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI About page. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412378 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-22 00:11:02 +00:00 |
Siddharth Seth
|
fa6b7fca7a
|
merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. (Contributed by Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411293 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-19 16:44:28 +00:00 |
Thomas White
|
db8545d924
|
Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-19 15:16:57 +00:00 |
Alejandro Abdelnur
|
63d27f591c
|
MAPREDUCE-4800. Cleanup o.a.h.mapred.MapTaskStatus - remove unused code. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410701 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-17 06:16:58 +00:00 |
Robert Joseph Evans
|
19748556f8
|
svn merge -c 1410498 FIXES: MAPREDUCE-4802. Takes a long time to load the task list on the AM for large jobs (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410502 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-16 17:32:31 +00:00 |
Robert Joseph Evans
|
34abf278dd
|
svn merge -c 1410131 FIXES: MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely closed channels (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410132 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-16 00:55:56 +00:00 |
Robert Joseph Evans
|
9a5a5082c6
|
Updated CHANGES.txt in preparation for 0.23.5 release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409821 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-15 14:59:27 +00:00 |
Eli Collins
|
3bc91c97cb
|
MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-15 00:17:17 +00:00 |
Robert Joseph Evans
|
c26bf3b838
|
svn merge -c 1409580 FIXES: MAPREDUCE-4720. Browser thinks History Server main page JS is taking too long (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409583 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-15 00:02:52 +00:00 |
Robert Joseph Evans
|
3b9bb65473
|
svn merge -c 1409525 FIXES: MAPREDUCE-4797. LocalContainerAllocator can loop forever trying to contact the RM (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409528 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-14 23:06:48 +00:00 |
Jason Darrell Lowe
|
8ca6059743
|
svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-14 19:26:54 +00:00 |
Thomas Graves
|
6a743f3f5b
|
merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-13 23:49:04 +00:00 |
Robert Joseph Evans
|
32850b486b
|
svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-12 20:38:55 +00:00 |
Robert Joseph Evans
|
ec861244a2
|
svn merge -c 1408360 FIXES: MAPREDUCE-4425. Speculation + Fetch failures can lead to a hung job (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408361 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-12 17:19:58 +00:00 |
Robert Joseph Evans
|
b3c28a5753
|
svn merge -c 1408355 FIXES: MAPREDUCE-4787. TestJobMonitorAndPrint is broken (Rob Parker via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408357 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-12 17:07:22 +00:00 |
Robert Joseph Evans
|
74656788e5
|
svn merge -c 1408314 FIXES: MAPREDUCE-4751. AM stuck in KILL_WAIT for days (vinodkv via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408316 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-12 15:19:41 +00:00 |
Thomas White
|
d488a59497
|
Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-12 13:57:19 +00:00 |
Robert Joseph Evans
|
b8f37b3b36
|
svn merge -c 1407679 FIXES: MAPREDUCE-4774. JobImpl does not handle asynchronous task events in FAILED state (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407682 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-09 23:00:57 +00:00 |
Jonathan Turner Eagles
|
1d58a7b5b3
|
MAPREDUCE-4666. JVM metrics for history server. (jlowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407670 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-09 22:22:16 +00:00 |
Robert Joseph Evans
|
80a05764be
|
svn merge -c 1407551 FIXES: MAPREDUCE-4266. remove Ant remnants from MR (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407552 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-09 17:28:58 +00:00 |
Robert Joseph Evans
|
82ccfb726a
|
svn merge -c 1407505 FIXES: MAPREDUCE-4782. NLineInputFormat skips first line of last InputSplit (Mark Fuhs via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407506 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-09 15:53:52 +00:00 |
Robert Joseph Evans
|
6b3db6eabd
|
svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-08 15:21:36 +00:00 |
Thomas White
|
501b2758ce
|
Merge -r 1406644:1406645 from trunk to branch-2. Fixes: MAPREDUCE-4777. In TestIFile, testIFileReaderWithCodec relies on testIFileWriterWithCodec. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406647 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-07 14:12:55 +00:00 |
Robert Joseph Evans
|
cb0f68cc3f
|
svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-05 22:16:51 +00:00 |
Robert Joseph Evans
|
11822fb8ab
|
svn merge -c 1404988 FIXES: MAPREDUCE-4763 repair test TestUmbilicalProtocolWithJobToken (Ivan A. Veselovsky via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404991 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-02 15:05:06 +00:00 |
Jason Darrell Lowe
|
a280cd5567
|
svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-01 23:05:53 +00:00 |
Robert Joseph Evans
|
d9e5740ce7
|
svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
|
2012-11-01 17:07:24 +00:00 |
Robert Joseph Evans
|
9d689a9db9
|
svn merge -c 1404305 FIXES: MAPREDUCE-4724. job history web ui applications page should be sorted to display last app first (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404306 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-31 19:13:59 +00:00 |
Thomas Graves
|
b958fa85a5
|
merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-31 15:02:59 +00:00 |
Alejandro Abdelnur
|
d3e2e2cb68
|
MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-30 05:52:17 +00:00 |
Jason Darrell Lowe
|
58c43cc8cb
|
svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-26 21:05:33 +00:00 |
Vinod Kumar Vavilapalli
|
79a14bb25f
|
MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1401941 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-25 01:27:17 +00:00 |
Jason Darrell Lowe
|
33cb0be07c
|
svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-24 15:47:01 +00:00 |
Jason Darrell Lowe
|
b702473f5c
|
svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-24 15:25:22 +00:00 |
Daryn Sharp
|
d647f98cb8
|
Updating credits for MAPREDUCE-4229.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401491 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-23 21:19:02 +00:00 |
Daryn Sharp
|
7b36e659c1
|
svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-23 21:10:17 +00:00 |
Siddharth Seth
|
5d200b2ab3
|
merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-23 21:03:17 +00:00 |
Jason Darrell Lowe
|
43159cc20d
|
svn merge -c 1401054 FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-22 19:58:01 +00:00 |
Vinod Kumar Vavilapalli
|
3d8fa1d6c4
|
MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1400264 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-19 20:20:03 +00:00 |
Robert Joseph Evans
|
edd3bc5cc2
|
svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-19 17:53:18 +00:00 |
Vinod Kumar Vavilapalli
|
5944b1c703
|
MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1399976 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-19 05:59:25 +00:00 |
Eli Collins
|
a38d2b8c78
|
HADOOP-8925. Remove the packaging. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399901 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-18 22:43:35 +00:00 |
Robert Joseph Evans
|
070ae0d73e
|
svn merge -c 1399289 FIXES: MAPREDUCE-4721. Task startup time in JHS is same as job startup time. (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399291 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-17 15:01:10 +00:00 |
Robert Joseph Evans
|
0f4838ab6b
|
svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-16 22:00:51 +00:00 |
Suresh Srinivas
|
3a9aadc3c7
|
HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-12 04:48:40 +00:00 |
Arun Murthy
|
267bfc5ff2
|
Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-11 17:22:27 +00:00 |
Thomas White
|
4a63906756
|
Merge -r 1396046:1396047 from trunk to branch-2. Fixes: MAPREDUCE-4654. TestDistCp is ignored. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396051 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-09 14:49:51 +00:00 |
Harsh J
|
9a0f100130
|
MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-09 13:41:45 +00:00 |
Siddharth Seth
|
7e55280b5b
|
merge MAPREDUCE-4705 from trunk. Fix a bug in job history lookup, which makes older jobs inaccessible despite the presence of a valid history file. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395851 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-09 03:24:43 +00:00 |
Siddharth Seth
|
b98a3a3787
|
merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-09 01:58:07 +00:00 |
Robert Joseph Evans
|
09f0aee7f8
|
svn merge -c 1395769 FIXES: MAPREDUCE-4554. Job Credentials are not transmitted if security is turned off (Benoy Antony via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395772 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-08 20:55:21 +00:00 |
Thomas Graves
|
279d3cc66a
|
merge -r 1394608:1394609 from trunk. FIXES: MAPREDUCE-4712
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395726 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-08 19:04:43 +00:00 |
Siddharth Seth
|
aa53f366c8
|
merge MAPREDUCE-4123 from trunk. Remove the 'mapred groups' command, which is no longer supported. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393776 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-03 21:28:49 +00:00 |
Arun Murthy
|
a28e01b337
|
HADOOP-8738. Reverted since it broke MR based system tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1392676 13f79535-47bb-0310-9956-ffa450edef68
|
2012-10-01 22:44:08 +00:00 |
Arun Murthy
|
bfb69f6eea
|
Merge -c 1392075 from trunk to branch-2 to fix MAPREDUCE-4681. Fix unit tests broken by HDFS-3910. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1392076 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-30 17:02:27 +00:00 |
Robert Joseph Evans
|
76aa144c64
|
Preparing for release 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391806 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-29 14:18:27 +00:00 |
Robert Joseph Evans
|
81b14fae80
|
svn merge -c 1391679 FIXES: MAPREDUCE-4689. JobClient.getMapTaskReports on failed job results in NPE (jlowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391680 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-28 22:18:32 +00:00 |
Jason Darrell Lowe
|
f40997309e
|
svn merge -c 1391671 FIXES: MAPREDUCE-4691. Historyserver can report "Unknown job" after RM says job has completed. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391675 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-28 22:00:42 +00:00 |
Arun Murthy
|
e619da2136
|
Reverted MAPREDUCE-4253 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-26 18:43:17 +00:00 |
Thomas Graves
|
e5e1887092
|
merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-26 15:25:05 +00:00 |
Arun Murthy
|
6667d885bb
|
Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390226 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-25 23:50:03 +00:00 |
Konstantin Shvachko
|
1aba4503cf
|
MAPREDUCE-4651. Benchmarking random reads with DFSIO. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390161 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-25 21:36:30 +00:00 |
Konstantin Shvachko
|
7cf9362055
|
MAPREDUCE-4645. Provide a random seed to Slive to make the sequence of file names deterministic. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389595 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-24 21:17:29 +00:00 |
Eli Collins
|
1b04c502e0
|
MAPREDUCE-4674. Hadoop examples secondarysort has a typo "secondarysrot" in the usage. Contributed by Robert Justice
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388663 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-21 20:16:16 +00:00 |
Thomas White
|
9e1860bfbf
|
Merge -r 1384832:1384833 from trunk to branch-2. Fixes: HADOOP-8780. Update DeprecatedProperties apt file.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384835 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-14 16:15:20 +00:00 |
Aaron Myers
|
ac103a4314
|
HADOOP-8755. Print thread dump when tests fail due to timeout. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384628 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-14 01:50:35 +00:00 |
Vinod Kumar Vavilapalli
|
a5e50dfae9
|
MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1383709 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-12 00:59:59 +00:00 |
Eli Collins
|
8644881db7
|
HDFS-3910. DFSTestUtil#waitReplication should timeout. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383619 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-11 21:28:53 +00:00 |
Thomas White
|
803905eb5a
|
Merge -r 1383421:1383422 from trunk to branch-2. Fixes: MAPREDUCE-4607. Race condition in ReduceTask completion can result in Task being incorrectly failed. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383425 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-11 14:13:58 +00:00 |
Arun Murthy
|
f403be7569
|
Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-10 12:57:48 +00:00 |
Arun Murthy
|
c76e05c1b7
|
Set date for hadoop-2.0.2-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382198 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-07 22:37:55 +00:00 |
Arun Murthy
|
d47f6bb16e
|
Preparing for hadoop-2.0.2-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382195 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-07 22:34:25 +00:00 |
Alejandro Abdelnur
|
2cdffe63d5
|
MAPREDUCE-4642. MiniMRClientClusterFactory should not use job.setJar() (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382094 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-07 17:06:55 +00:00 |
Robert Joseph Evans
|
ebb1a16f62
|
svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-07 16:47:04 +00:00 |
Arun Murthy
|
b9a3f51dcd
|
Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-07 04:59:20 +00:00 |
Robert Joseph Evans
|
928e6864d3
|
svn merge -c 1381784 FIXES: MAPREDUCE-4641. Exception in commitJob marks job as successful in job history (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381786 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-06 22:22:01 +00:00 |
Robert Joseph Evans
|
2616974383
|
svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-06 14:22:04 +00:00 |
Eli Collins
|
515dfba075
|
Fix MAPREDUCE-4580 build breakage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381316 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-05 19:36:28 +00:00 |
Robert Joseph Evans
|
8d310aad55
|
pdating CHANGES.txt for 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380907 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-04 21:48:58 +00:00 |
Konstantin Shvachko
|
54ca8b837c
|
MAPREDUCE-2786. Add compression option for TestDFSIO. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380308 13f79535-47bb-0310-9956-ffa450edef68
|
2012-09-03 18:50:28 +00:00 |
Jonathan Turner Eagles
|
a64a30ce6c
|
svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-31 21:31:23 +00:00 |
Thomas Graves
|
c54a74a2cc
|
merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-31 20:45:34 +00:00 |
Robert Joseph Evans
|
8ef7e47241
|
svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-31 20:39:03 +00:00 |
Robert Joseph Evans
|
b2382b0cd4
|
svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-31 20:26:26 +00:00 |
Vinod Kumar Vavilapalli
|
e591c4f4dc
|
MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1379146 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-30 21:04:05 +00:00 |
Robert Joseph Evans
|
0fb6e7626f
|
HADOOP-8726. The Secrets in Credentials are not available to MR tasks (daryn and Benoy Antony via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379105 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-30 19:59:53 +00:00 |
Thomas White
|
9f94b89742
|
Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-30 17:14:07 +00:00 |
Thomas White
|
ebbb304022
|
Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-30 10:02:31 +00:00 |
Robert Joseph Evans
|
a88454abb7
|
MAPREDUCE-4600. TestTokenCache.java from MRV1 no longer compiles (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378267 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-28 18:53:53 +00:00 |
Alejandro Abdelnur
|
5d74838376
|
HADOOP-8738. junit JAR is showing up in the distro (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378177 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-28 15:32:28 +00:00 |
Vinod Kumar Vavilapalli
|
14b1cf459b
|
MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves.
svn merge --ignore-ancestry -c 1377943 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-28 02:05:25 +00:00 |
Siddharth Seth
|
a1c556ca19
|
merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-28 00:41:03 +00:00 |
Siddharth Seth
|
bf08346d3c
|
merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-25 02:25:12 +00:00 |
Alejandro Abdelnur
|
2ff2b79e33
|
MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-24 23:38:21 +00:00 |
Robert Joseph Evans
|
bc5f02bac0
|
svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-23 18:07:59 +00:00 |
Alejandro Abdelnur
|
6e831b0f5e
|
MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-23 00:24:36 +00:00 |
Aaron Myers
|
0490537635
|
MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-22 22:45:30 +00:00 |
Alejandro Abdelnur
|
d7a90bc552
|
MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-22 21:23:09 +00:00 |
Robert Joseph Evans
|
1ee0c23b39
|
svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-21 17:47:08 +00:00 |
Robert Joseph Evans
|
f3f8edbd10
|
svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-21 15:21:30 +00:00 |
Thomas Graves
|
e94632c765
|
merge -r 1374423:1374424 from trunk. FIXES: YARN-25
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374425 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-17 20:31:09 +00:00 |
Daryn Sharp
|
a8f10869a8
|
svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-17 16:26:01 +00:00 |
Thomas White
|
832e7c6dc3
|
Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-16 13:27:24 +00:00 |
Tsz-wo Sze
|
1294ad1df7
|
svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-16 01:42:16 +00:00 |
Alejandro Abdelnur
|
fc783dcc1e
|
MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-15 23:11:00 +00:00 |
Thomas White
|
15b9897255
|
Merge -r 1373573:1373574 from trunk to branch-2. Fixes: HADOOP-8278 - Make sure components declare correct set of dependencies
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373594 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-15 19:28:51 +00:00 |
Alejandro Abdelnur
|
b344870bdd
|
HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-13 21:56:31 +00:00 |
Thomas Graves
|
6f516ea1bf
|
merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-13 21:50:21 +00:00 |
Robert Joseph Evans
|
4705652915
|
svn merge -c 1371325 FIXES: MAPREDUCE-3782. teragen terasort jobs fail when using webhdfs:// (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371332 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-09 17:39:37 +00:00 |
Arun Murthy
|
92a99de731
|
Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-08 05:33:56 +00:00 |
Alejandro Abdelnur
|
88593c443d
|
Merge -r 1370119:1370120 from trunk to branch. FIXES: MAPREDUCE-4484
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370121 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-07 05:16:15 +00:00 |
Alejandro Abdelnur
|
6c4b4e19b3
|
Merge -r 1370117:1370118 from trunk to branch. FIXES: MAPREDUCE-4494
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370119 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-07 05:12:08 +00:00 |
Alejandro Abdelnur
|
2a178a8d0b
|
Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-06 18:15:35 +00:00 |
Jonathan Turner Eagles
|
054dd2d39c
|
svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-03 20:42:18 +00:00 |
Siddharth Seth
|
f7545f076e
|
Merge MAPREDUCE-3289 from trunk. Make use of fadvise in the NM's shuffle handler. (Contributed by Todd Lipcon and Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368722 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-02 21:57:42 +00:00 |
Thomas Graves
|
6b3c8934f3
|
merge -r 1368293:1368294 from trunk. FIXES: MAPREDUCE-4504
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368296 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-01 22:20:59 +00:00 |
Eli Collins
|
afd9e523cd
|
HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368259 13f79535-47bb-0310-9956-ffa450edef68
|
2012-08-01 21:30:06 +00:00 |
Jonathan Turner Eagles
|
d40b6be2f5
|
svn merge -c 1367789 FIXES: MAPREDUCE-4234. SortValidator.java is incompatible with multi-user or parallel use (due to a /tmp file with static name) (Robert Evans via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367793 13f79535-47bb-0310-9956-ffa450edef68
|
2012-07-31 21:45:45 +00:00 |
Robert Joseph Evans
|
bc65eefdd3
|
svn merge -c 1367783 FIXES: MAPREDUCE-4444. nodemanager fails to start when one of the local-dirs is bad (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367784 13f79535-47bb-0310-9956-ffa450edef68
|
2012-07-31 21:09:43 +00:00 |
Thomas Graves
|
66d468eece
|
merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68
|
2012-07-31 20:53:45 +00:00 |
Robert Joseph Evans
|
6817f87461
|
svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367729 13f79535-47bb-0310-9956-ffa450edef68
|
2012-07-31 19:50:11 +00:00 |
Robert Joseph Evans
|
e265f69a18
|
svn merge -c 1367719 FIXES: MAPREDUCE-4492. Configuring total queue capacity between 100.5 and 99.5 at perticular level is sucessfull (Mayank Bansal via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367720 13f79535-47bb-0310-9956-ffa450edef68
|
2012-07-31 19:35:39 +00:00 |