Author: szetszwo Date: Tue Jan 17 02:28:49 2012 New Revision: 1232275 URL: http://svn.apache.org/viewvc?rev=1232275&view=rev Log: Merge r1231828 through r1232270 from 0.23.
Modified: hadoop/common/branches/branch-0.23-PB/ (props changed) hadoop/common/branches/branch-0.23-PB/hadoop-project/ (props changed) hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-0.23-PB/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 02:28:49 2012 @@ -1,2 +1,2 @@ -/hadoop/common/branches/branch-0.23:1227776-1231827 +/hadoop/common/branches/branch-0.23:1227776-1232270 /hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640 Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 02:28:49 2012 @@ -1,2 +1,2 @@ -/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1231827 +/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1232270 /hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640 Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 17 02:28:49 2012 @@ -1,2 +1,2 @@ -/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1231827 +/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1232270 /hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182205,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205626,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225192,1225456,1225489,1225591,1226211,1226239,1227091,1227165,1227423,1229347,1230398,1231569,1231572,1231627,1231640