Commit Graph

1456 Commits

Author SHA1 Message Date
Arun Murthy 42dbcbb4d8 Merge -r 1166974:1166975 from trunk to branch-0.23 to fix MAPREDUCE-2963.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166976 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 03:01:44 +00:00
Arun Murthy a9b04ba0e9 Adding back hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources which was missed during merge of MAPREDUCE-279.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166973 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:53:41 +00:00
Arun Murthy 1b316b7707 Merge -r 1166967:1166968 from trunk to branch-0.23 to fix MAPREDUCE-2953.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166969 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:20:03 +00:00
Arun Murthy 778e65aa74 Merge -r 1166965:1166966 from trunk to branch-0.23 to fix MAPREDUCE-2937.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166967 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:15:20 +00:00
Arun Murthy 4ffba53aca fMerge -r 1166957:1166958 from trunk to branch-0.23 to fix MAPREDUCE-2690.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166959 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 02:05:55 +00:00
Arun Murthy 3dd8d9476b Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166957 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 01:58:40 +00:00
Arun Murthy d3960b01f7 Merge -r 1166912:1166913 from trunk to branch-0.23 to fix HADOOP-7598.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166914 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 21:33:07 +00:00
Arun Murthy 2df748af75 Merge -r 1166900:1166901 from trunk to branch-0.23 to fix MAPREDUCE-2677.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166904 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 21:04:17 +00:00
Arun Murthy a67a1c0e04 Merge -r 1166854:1166856 from trunk to branch-0.23 to fix MAPREDUCE-2844.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166858 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:50:32 +00:00
Thomas White efb369ebb8 Merge -r 1166847:1166848 from trunk to branch. Fixes: HADOOP-7612
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166852 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:43:55 +00:00
Arun Murthy 666a581924 Merge -r 1166848:1166849 from trunk to branch-0.23 to fix MAPREDUCE-2947.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166851 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:41:07 +00:00
Arun Murthy dc896c8bc6 Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166840 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 18:28:14 +00:00
Konstantin Shvachko 85f31600bb HDFS-2232. Generalize regular expressions in TestHDFSCLI. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166472 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 23:42:35 +00:00
Todd Lipcon baa994281e HADOOP-7507. Allow ganglia metrics to include the metrics system tags in the gmetric names. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166459 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 22:58:58 +00:00
Mahadev Konar f049f33e5a MAPREDUCE-2948. Hadoop streaming test failure, post MR-2767 (mahadev) - merging r1166402 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166405 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 21:20:46 +00:00
Arun Murthy 210eb9ee47 Merge -r 1166005:1166006 from trunk to branch-0.23 to fix MAPREDUCE-2938.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166007 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 05:56:05 +00:00
Arun Murthy c1e1e0857d Merge -r 1165948:1165950 from trunk to branch-0.23 to fix MAPREDUCE-2655.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165951 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 01:27:16 +00:00
Arun Murthy 2afd149137 Merge -r 1165932:1165933 from trunk to branch-0.23 to fix MAPREDUCE-2774.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165935 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 23:41:30 +00:00
Arun Murthy e7c0ee77c6 Merge -r 1165929:1165930 from trunk to branch-0.23 to fix MAPREDUCE-2800.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165932 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 23:37:04 +00:00
Konstantin Shvachko 3cd4935629 MAPREDUCE-2767. Remove Linux task-controller from 0.23 branch. Contributed by Milind Bhandarkar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165912 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 22:36:28 +00:00
Mahadev Konar 6357286bc6 Reverting MAPREDUCE-2936 in 0.23 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165896 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 22:01:13 +00:00
Arun Murthy 301e322096 Merge -r 1165889:1165890 from trunk to branch-0.23 to fix MAPREDUCE-2687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165891 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 21:50:44 +00:00
Vinod Kumar Vavilapalli 65d5b0b9d3 HADOOP-7606. svn merge -c r1164779 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165692 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 14:58:30 +00:00
Vinod Kumar Vavilapalli d05cac73b3 MAPREDUCE-2936. svn merge -c r1165657 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165667 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 13:40:49 +00:00
Arun Murthy 78824911cf Merge -r 1165472:1165473 from trunk to branch-0.23 to fix HADOOP-7580.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165474 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 01:37:54 +00:00
Todd Lipcon c076b3c758 MAPREDUCE-2882. TestLineRecordReader depends on ant jars. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165448 13f79535-47bb-0310-9956-ffa450edef68
2011-09-05 23:21:42 +00:00
Arun Murthy 574aa2b2f5 Merge -r 1165402:1165403 from trunk to branch-0.23 to fix MAPREDUCE-2697.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165404 13f79535-47bb-0310-9956-ffa450edef68
2011-09-05 19:54:46 +00:00
Vinod Kumar Vavilapalli cb8d102f97 MAPREDUCE-2716. svn merge -c r1164805 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164807 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 06:46:45 +00:00
Eli Collins 326cdada1f HADOOP-7552. svn merge -c 1164339 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164341 13f79535-47bb-0310-9956-ffa450edef68
2011-09-02 03:28:52 +00:00
Mahadev Konar 8f774dd5ab HADOOP-7604. Hadoop Auth examples pom in 0.23 point to 0.24 versions. (mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164336 13f79535-47bb-0310-9956-ffa450edef68
2011-09-02 02:48:33 +00:00
Arun Murthy d652391131 Merge -r 1164300:1164301 from trunk to branch-0.23 to fix MAPREDUCE-2735.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164302 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 23:59:05 +00:00
Arun Murthy e5e45c4f1b Merge -r 1164254:1164255 from trunk to branch-0.23 to fix MAPREDUCE-2756.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164258 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 20:26:12 +00:00
Aaron Myers 8019d90630 HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164179 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 17:24:05 +00:00
Tsz-wo Sze 05dbca229f svn merge -c 1163858 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163860 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 23:01:16 +00:00
Tsz-wo Sze 8af6ddf8ec svn merge -c 1163852 from trunk for HADOOP-7579. Contributed by Alejandro Abdelnur
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163856 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 22:47:51 +00:00
Arun Murthy 2572c7c434 Merge -r 1163767:1163768 from trunk to branch-0.23 to fix MAPREDUCE-2917.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163769 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 19:54:16 +00:00
Vinod Kumar Vavilapalli 464486bee3 MAPREDUCE-2652. svn merge -c r1163585 --ignore-ancestry trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163626 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 14:07:25 +00:00
Mahadev Konar 481f93a6aa MAPREDUCE-2916. Ivy build for MRv1 fails with bad organization for common daemon. (mahadev) - merge r1163490 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163491 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 05:51:58 +00:00
Tsz-wo Sze 7214f64b2c svn merge -c 1163465 from trunk for HADOOP-7593. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163466 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 01:20:43 +00:00
Matthew Foley 0fdcf88498 HDFS-1330 and HADOOP-6889. Added additional unit tests. Contributed by John George.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163464 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 01:10:24 +00:00
Tsz-wo Sze 25aa51a802 Remove svn:mergeinfo from TestSequenceFile.java
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163461 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 00:54:49 +00:00
Tsz-wo Sze 5630e83f2e svn merge -c 1163456 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163460 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 00:52:28 +00:00
Tsz-wo Sze 80ba8f8d4d svn merge -c 1163081 from trunk for HDFS-1217. Constributed by Laxman
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163082 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 04:07:03 +00:00
Arun Murthy ea92e62344 Merge -r 1163068:1163069 from trunk to branch-0.23 to fix MAPREDUCE-2897.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163070 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 01:23:54 +00:00
Mahadev Konar e123403fda MAPREDUCE-2886. Fix Javadoc warnings in MapReduce. (mahadev) - Merge r1163050 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163051 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 23:31:00 +00:00
Mahadev Konar 0165337cc0 MAPREDUCE-2737. Update the progress of jobs on client side. (Siddharth Seth and Mahadev Konar via mahadev) - Merging from trunk r1162979
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162984 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 20:26:04 +00:00
Arun Murthy 2e79f3a6e2 Merge -r 1162953:1162954 from trunk to branch-0.23 to fix MAPREDUCE-2904.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162955 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 19:38:10 +00:00
Mahadev Konar fb8355ca7b HADOOP-7589. Prefer mvn test -DskipTests over mvn compile in test-patch.sh (Robert Evans via mahadev) - Merge r1162928 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162931 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 18:27:29 +00:00
Arun Murthy 55101abd6d Merge -r 1162612:1162613 from trunk to branch-0.23 to fix MAPREDUCE-2898.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162614 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 00:04:53 +00:00
Arun Murthy 2ee8e13bcd Merge -r 1162498:1162499 from trunk to branch-0.23 to fix MAPREDUCE-2891.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162502 13f79535-47bb-0310-9956-ffa450edef68
2011-08-28 11:42:42 +00:00