961 Commits

Author	SHA1	Message	Date
Robert Joseph Evans	0bed0fec3c	svn merge -c 1345304. FIXES: HADOOP-8460. Document proper setting of HADOOP_PID_DIR and HADOOP_SECURE_DN_PID_DIR (bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345306 13f79535-47bb-0310-9956-ffa450edef68	2012-06-01 18:19:02 +00:00
Robert Joseph Evans	f376251475	svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344764 13f79535-47bb-0310-9956-ffa450edef68	2012-05-31 15:17:39 +00:00
Robert Joseph Evans	ed20ba2e49	svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68	2012-05-30 14:52:39 +00:00
Harsh J	4200fa906e	svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 16:15:25 +00:00
Thomas White	5e473c9c6e	Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68	2012-05-29 14:45:25 +00:00
Harsh J	1f804b5d20	svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68	2012-05-28 14:58:13 +00:00
Thomas Graves	02a703fac2	merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68	2012-05-24 13:17:08 +00:00
Alejandro Abdelnur	897314775b	Merge -r 1342074:1342075 from trunk to branch. FIXES: MAPREDUCE-4276 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342076 13f79535-47bb-0310-9956-ffa450edef68	2012-05-23 22:23:50 +00:00
Thomas Graves	f57e335252	merge -r 1341971:1341972 from trunk. FIXES: MAPREDUCE-4262 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341973 13f79535-47bb-0310-9956-ffa450edef68	2012-05-23 18:38:23 +00:00
Thomas Graves	0a0c649c86	merge -r 1341159:1341160 from trunk. FIXES: MAPREDUCE-3870 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341162 13f79535-47bb-0310-9956-ffa450edef68	2012-05-21 19:22:49 +00:00
Robert Joseph Evans	1586e827ed	i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68	2012-05-21 19:07:13 +00:00
Thomas Graves	1c65990dae	merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68	2012-05-21 01:57:21 +00:00
Eli Collins	619cc6a775	HDFS-2885. Remove "federation" from the nameservice config options. Contributed by Tsz Wo (Nicholas), SZE ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340842 13f79535-47bb-0310-9956-ffa450edef68	2012-05-20 21:15:16 +00:00
Todd Lipcon	58f72f035f	MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340629 13f79535-47bb-0310-9956-ffa450edef68	2012-05-20 07:41:37 +00:00
Thomas Graves	297cbcca27	merge -r 1339956:1339957 from trunk. FIXES: MAPREDUCE-4197 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339958 13f79535-47bb-0310-9956-ffa450edef68	2012-05-18 02:51:56 +00:00
Thomas Graves	b35de62e1d	MAPREDUCE-3543. Mavenize Gridmix. (tgraves) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68	2012-05-17 15:31:19 +00:00
Alejandro Abdelnur	00875b37f6	HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 19:46:30 +00:00
Thomas Graves	a1ce7813e9	merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 14:10:35 +00:00
Todd Lipcon	73766e6d1d	Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 05:44:01 +00:00
Alejandro Abdelnur	e8ea3fdb52	Merge -r 1338999:1339000 from trunk to branch. FIXES: MAPREDUCE-4250 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339002 13f79535-47bb-0310-9956-ffa450edef68	2012-05-16 04:16:37 +00:00
Thomas Graves	c993d1bac5	merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338841 13f79535-47bb-0310-9956-ffa450edef68	2012-05-15 19:15:43 +00:00
Tsz-wo Sze	a5da2f6d68	Merge r1329319 for HADOOP-8285 for the changes outside common. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337433 13f79535-47bb-0310-9956-ffa450edef68	2012-05-12 02:19:58 +00:00
Robert Joseph Evans	5922f4f064	svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 20:27:58 +00:00
Aaron Myers	35b27ae3f5	HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. Contributed by Roman Shaposhnik. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337252 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 16:16:55 +00:00
Thomas White	dc576b9fa1	Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68	2012-05-11 15:04:24 +00:00
Tsz-wo Sze	b41b4e9c43	svn merge -c 1336909 from trunk for HDFS-3369. Rename {get|set|add}INode(..) methods in BlockManager and BlocksMap to {get|set|add}BlockCollection(..). ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336911 13f79535-47bb-0310-9956-ffa450edef68	2012-05-10 21:45:45 +00:00
Robert Joseph Evans	00f0379a54	svn merge -c 1336399. FIXES: MAPREDUCE-4237. TestNodeStatusUpdater can fail if localhost has a domain associated with it (bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336401 13f79535-47bb-0310-9956-ffa450edef68	2012-05-09 21:10:02 +00:00
Tsz-wo Sze	8a99480f44	svn merge -c 1335661 from trunk for MAPREDUCE-4231. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335662 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 17:57:07 +00:00
Thomas Graves	9b6535579e	merge -r 1335646:1335647 from trunk. FIXES: MAPREDUCE-4215 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335648 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 17:14:43 +00:00
Robert Joseph Evans	c35e442b1b	svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:26:11 +00:00
Robert Joseph Evans	4bc2774d79	svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68	2012-05-08 15:10:03 +00:00
Thomas White	f1e31ebaf2	Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68	2012-05-07 19:07:29 +00:00
Robert Joseph Evans	e54add89a8	svn merge -c 1335096 FIXES: MAPREDUCE-4220. RM apps page starttime/endtime sorts are incorrect (Jonathan Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335098 13f79535-47bb-0310-9956-ffa450edef68	2012-05-07 16:19:34 +00:00
Robert Joseph Evans	95a0505c60	svn merge -c 1334043. FIXES: MAPREDUCE-3958. RM: Remove RMNodeState and replace it with NodeState (Bikas Saha via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334045 13f79535-47bb-0310-9956-ffa450edef68	2012-05-04 15:48:13 +00:00
Robert Joseph Evans	13acee63d3	svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68	2012-05-04 15:04:08 +00:00
Alejandro Abdelnur	9a04fc6caf	Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68	2012-05-04 03:21:15 +00:00
Robert Joseph Evans	c9aac0a1d1	svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68	2012-05-03 18:37:01 +00:00
Alejandro Abdelnur	d5defb5e60	Merge -r 1333240:1333241 from trunk to branch. FIXES: MAPREDUCE-4219 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333242 13f79535-47bb-0310-9956-ffa450edef68	2012-05-02 22:54:36 +00:00
Robert Joseph Evans	611dffafc7	svn merge -c 1333144 FIXES: MAPREDUCE-4210. Expose listener address for WebApp (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333145 13f79535-47bb-0310-9956-ffa450edef68	2012-05-02 18:28:13 +00:00
Robert Joseph Evans	76cc94f43f	svn merge -c 1333063 FIXES: MAPREDUCE-3173. MRV2 UI doesn't work properly without internet (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333066 13f79535-47bb-0310-9956-ffa450edef68	2012-05-02 14:44:10 +00:00
Robert Joseph Evans	007878d3e2	MAPREDUCE-4202. Updating changes to just be branch-2 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332728 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 16:13:53 +00:00
Robert Joseph Evans	5765eb1868	svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 16:02:31 +00:00
Robert Joseph Evans	848a2026f2	svn merge -c 1332701 FIXES: MAPREDUCE-4211. Error conditions (missing appid, appid not found) are masked in the RM app page (Jonathan Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332703 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 15:36:09 +00:00
Thomas Graves	1a17df6b21	merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68	2012-05-01 14:11:31 +00:00
Thomas Graves	41ce1fa860	merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68	2012-04-30 15:08:30 +00:00
Robert Joseph Evans	f17cf45efe	svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68	2012-04-30 14:49:43 +00:00
Thomas Graves	0b6d455dc8	merge -r 1332195:1332196 from trunk. FIXES: MAPREDUCE-3883 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332198 13f79535-47bb-0310-9956-ffa450edef68	2012-04-30 13:44:12 +00:00
Robert Joseph Evans	da0f9645a0	svn merge -c 1331046. FIXES: MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331048 13f79535-47bb-0310-9956-ffa450edef68	2012-04-26 19:44:22 +00:00
Thomas White	e5e15fab74	Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68	2012-04-26 18:48:13 +00:00
Robert Joseph Evans	0f0204c3c2	svn merge -c 1331012. FIXES: MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331014 13f79535-47bb-0310-9956-ffa450edef68	2012-04-26 18:28:18 +00:00
Thomas Graves	bb9cfbb052	merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68	2012-04-25 21:14:13 +00:00
Robert Joseph Evans	7f40acc947	svn merge -c 1330552 FIXES: MAPREDUCE-4194. ConcurrentModificationError in DirectoryCollection (Jonathan Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330555 13f79535-47bb-0310-9956-ffa450edef68	2012-04-25 20:53:15 +00:00
Thomas White	a7e688c6a8	Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68	2012-04-25 17:22:53 +00:00
Thomas Graves	f8f390b83d	merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68	2012-04-24 13:07:22 +00:00
Alejandro Abdelnur	37026cea83	Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 22:33:51 +00:00
Robert Joseph Evans	88d736ce2b	svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 19:46:16 +00:00
Robert Joseph Evans	1fca6cfe03	svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 19:39:43 +00:00
Robert Joseph Evans	1ea39ddc3c	svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68	2012-04-23 15:28:19 +00:00
Robert Joseph Evans	0c244e8703	svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:36:47 +00:00
Alejandro Abdelnur	479e5b0102	Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:34:49 +00:00
Robert Joseph Evans	8f4c3499f5	svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 20:24:45 +00:00
Robert Joseph Evans	e439d3bb39	MAPREDUCE-4093. Improve RM WebApp start up when proxy address is not set (Devaraj K vai bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328091 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 19:44:55 +00:00
Robert Joseph Evans	eec2fd9f74	MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 19:33:04 +00:00
Robert Joseph Evans	a18ad09c94	svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 16:23:35 +00:00
Thomas Graves	7221ae82e5	merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68	2012-04-19 14:54:03 +00:00
Robert Joseph Evans	461b330ebf	svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68	2012-04-18 18:48:20 +00:00
Siddharth Seth	be7e487ef3	Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68	2012-04-18 02:01:02 +00:00
Robert Joseph Evans	45b2835e9f	svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 22:13:52 +00:00
Thomas Graves	1769fd46e2	merge -r 1327262:1327263 from trunk. FIXES: MAPREDUCE-4151 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327265 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 20:06:49 +00:00
Thomas Graves	7fec5b7d94	merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327234 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 19:23:01 +00:00
Siddharth Seth	ab8ea1db58	Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68	2012-04-17 18:55:53 +00:00
Thomas Graves	27cdd16a50	merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326796 13f79535-47bb-0310-9956-ffa450edef68	2012-04-16 20:47:44 +00:00
Thomas Graves	e1aa56712c	merge -r 1326706:1326707 from trunk. FIXES: MAPREDUCE-4008 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326709 13f79535-47bb-0310-9956-ffa450edef68	2012-04-16 18:04:25 +00:00
Siddharth Seth	68f136337d	Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68	2012-04-13 22:26:07 +00:00
Robert Joseph Evans	8ca897dea2	svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68	2012-04-13 13:46:45 +00:00
Thomas White	f537469c7e	Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68	2012-04-13 00:11:53 +00:00
Siddharth Seth	d550503dbb	Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68	2012-04-12 18:41:09 +00:00
Thomas White	cb3d6c3d98	Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68	2012-04-12 16:31:15 +00:00
Thomas Graves	d31abfe3f8	merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 21:14:55 +00:00
Siddharth Seth	462f9a5249	MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 18:20:08 +00:00
Siddharth Seth	50c13a44af	merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 17:11:34 +00:00
Siddharth Seth	40497a9d04	merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68	2012-04-11 02:52:13 +00:00
Thomas Graves	15d3d52f1b	merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 22:10:34 +00:00
Robert Joseph Evans	3cf79f4c7e	svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 21:31:41 +00:00
Robert Joseph Evans	b04f23fc96	svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 20:37:13 +00:00
Tsz-wo Sze	b46380e463	svn merge -c 1311959 from trunk for MAPREDUCE-4057. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311960 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 19:50:09 +00:00
Robert Joseph Evans	07321a677c	svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 18:59:03 +00:00
Thomas Graves	ce9bdceac7	merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 18:13:09 +00:00
Robert Joseph Evans	a2c86e8e3d	MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311823 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 16:14:59 +00:00
Siddharth Seth	5f535af454	Merge MAPREDUCE-3869 from trunk. Fix classpath for DistributedShell application. (Contributed by Devaraj K) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311524 13f79535-47bb-0310-9956-ffa450edef68	2012-04-10 00:02:57 +00:00
Thomas White	de5069a6a1	Merge -r 1311519:1311520 from trunk to branch-2. Fixes MAPREDUCE-4105. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311521 13f79535-47bb-0310-9956-ffa450edef68	2012-04-09 23:35:21 +00:00
Robert Joseph Evans	f9e39d057e	svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68	2012-04-09 21:54:22 +00:00
Robert Joseph Evans	ea165d6e91	svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 18:57:44 +00:00
Arun Murthy	9562831e74	Added toString to ContainerToken. Contributed by Jason Lowe. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310538 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 18:41:51 +00:00
Robert Joseph Evans	34ed535299	svn merge -c 1310528 from trunk. FIXES: MAPREDUCE-4051. Remove the empty hadoop-mapreduce-project/assembly/all.xml file (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310529 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 18:10:11 +00:00
Robert Joseph Evans	6514ecce13	svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 16:05:36 +00:00
Robert Joseph Evans	cbbddcb3ca	svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 15:58:36 +00:00
Robert Joseph Evans	7c087c4a9b	svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68	2012-04-06 15:51:07 +00:00
Robert Joseph Evans	401d4b3584	svn merge -c 1310056 from trunk. FIXES: MAPREDUCE-4073. CS assigns multiple off-switch containers when using multi-level-queues (Siddharth Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310057 13f79535-47bb-0310-9956-ffa450edef68	2012-04-05 20:29:01 +00:00
Thomas Graves	0d388cd1f4	merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68	2012-04-05 20:13:11 +00:00
Alejandro Abdelnur	98f0abb721	Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 20:25:18 +00:00
Todd Lipcon	3c7d74132b	MAPREDUCE-4103. Fix HA docs for changes to shell command fencer args. Contributed by Todd Lipcon. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309535 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 18:46:28 +00:00
Robert Joseph Evans	eee35a6972	svn merge -c 1309481 FIXES: MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309482 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 16:24:38 +00:00
Robert Joseph Evans	954327f770	svn merge -c 1309453 from trunk FIXES: MAPREDUCE-3082. Archive command take wrong path for input file with current directory (John George via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309454 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 15:30:03 +00:00
Thomas Graves	378ed9b673	merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 15:12:24 +00:00
Alejandro Abdelnur	4bdf14f6c9	Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 14:57:41 +00:00
Thomas Graves	93af1a43be	merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68	2012-04-04 14:18:55 +00:00
Thomas Graves	4a3e9514c3	merge -r 1309132:1309133 from trunk. FIXES: MAPREDUCE-4020 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309134 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 20:41:22 +00:00
Robert Joseph Evans	18a6e47b98	svn merge -c 1309108 from trunk. FIXES MAPREDUCE-3999. Tracking link gives an error if the AppMaster hasn't started yet (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309110 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 19:38:43 +00:00
Robert Joseph Evans	8b39213000	svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 18:30:38 +00:00
Robert Joseph Evans	e76f7b7330	svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 18:03:18 +00:00
Robert Joseph Evans	c6c7055c83	MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 17:03:53 +00:00
Thomas Graves	ef5ca103f6	merge -r 1308975:1308976 from trunk. FIXES: MAPREDUCE-4012 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308985 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 15:39:35 +00:00
Robert Joseph Evans	463a8ca9a5	svn merge -c 1308957 from trunk. FIXES MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308958 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 14:49:01 +00:00
Robert Joseph Evans	8e3046a391	svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308930 13f79535-47bb-0310-9956-ffa450edef68	2012-04-03 14:21:02 +00:00
Robert Joseph Evans	97f328dc40	svn merge -c 1308566 from trunk. FIXES MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308568 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 21:07:47 +00:00
Thomas Graves	ad9f93f7b5	merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 20:24:46 +00:00
Robert Joseph Evans	54a0b26231	svn merge -c 1308507 from trunk FIXES: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308509 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 19:54:46 +00:00
Robert Joseph Evans	271eacf32d	Preping for 0.23.3 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308481 13f79535-47bb-0310-9956-ffa450edef68	2012-04-02 19:20:17 +00:00
Alejandro Abdelnur	c1ccd60f74	Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68	2012-03-30 21:31:34 +00:00
Alejandro Abdelnur	cf5dc702c9	Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307414 13f79535-47bb-0310-9956-ffa450edef68	2012-03-30 13:41:40 +00:00
Alejandro Abdelnur	4805df8366	Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 21:50:30 +00:00
Eli Collins	55d9276dd9	MAPREDUCE-3989. svn merge -c 1307102 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307103 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 20:55:21 +00:00
Robert Joseph Evans	581f9b4ca2	svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 15:20:06 +00:00
Arun Murthy	96d4812433	Merge -c 1306736 from trunk to branch-2 to fix MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306737 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 07:47:55 +00:00
Siddharth Seth	55639bea52	Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68	2012-03-29 02:04:21 +00:00
Arun Murthy	111c4a4bb5	Fixed CHANGES.txt to track Release 2.0.0. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306197 13f79535-47bb-0310-9956-ffa450edef68	2012-03-28 07:30:01 +00:00
Arun Murthy	3e8925aa92	Changed version in branch-2 to 2.0.0-SNAPSHOT. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68	2012-03-28 07:25:51 +00:00
Robert Joseph Evans	e7ec8a44b6	svn merge -c 1305607 trunk to branch-0.23 FIXES: MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 21:25:16 +00:00
Arun Murthy	debf11cc3f	MAPREDUCE-3353. Fixed commit msg to point to right jira. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305458 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 17:30:55 +00:00
Harsh J	92f06cb446	svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 13:31:08 +00:00
Arun Murthy	efe3382159	Merge -c 1305230 from trunk to branch-0.23 to fix MAPREDUCE-3533. Add a channel between RM and AM to get information on nodes. Contributed by Bikas Saha. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305231 13f79535-47bb-0310-9956-ffa450edef68	2012-03-26 05:46:55 +00:00
Robert Joseph Evans	1f3e5ebc0b	svn merge -c 1304587 from trunk to branch-0.23 FIXES: MAPREDUCE-4043. Secret keys set in Credentials are not seen by tasks (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304593 13f79535-47bb-0310-9956-ffa450edef68	2012-03-23 20:52:42 +00:00
Arun Murthy	708795ba15	Removed some logs. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304100 13f79535-47bb-0310-9956-ffa450edef68	2012-03-22 22:21:11 +00:00
Robert Joseph Evans	21bd7c348d	svn merge -c 1302980 from trunk to branch 0.23 FIXES MAPREDUCE-4034. Unable to view task logs on history server with mapreduce.job.acl-view-job=* (Jason Lowe and Siddarth Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302982 13f79535-47bb-0310-9956-ffa450edef68	2012-03-20 16:30:56 +00:00
Todd Lipcon	4ab173a9d4	MAPREDUCE-3992. Reduce fetcher doesn't verify HTTP status code of response. Contributed by Todd Lipcon. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302755 13f79535-47bb-0310-9956-ffa450edef68	2012-03-20 02:29:01 +00:00
Robert Joseph Evans	c02c9218d9	svn merge -c 1302645 from trunk to branch-0.23 FIXES MAPREDUCE-4025. AM can crash if task attempt reports bogus progress value (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302646 13f79535-47bb-0310-9956-ffa450edef68	2012-03-19 20:32:54 +00:00
Devaraj Das	94249757ee	merge -r1301819:1301820 from trunk onto branch-0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301821 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 23:23:13 +00:00
Thomas Graves	eb0311aedc	merge -r 1301730:1301731 from trunk to branch-0.23. FIXES: MAPREDUCE-4006 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301734 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 20:14:45 +00:00
Siddharth Seth	1514466b7a	merge MAPREDUCE-4005 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301693 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 18:48:57 +00:00
Robert Joseph Evans	4c0306714b	svn merge -c 1301551 from trunk to branch-0.23 FIXES MAPREDUCE-4010. TestWritableJobConf fails on trunk (tucu via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301553 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 14:40:32 +00:00
Steve Loughran	04abe3a9fe	MAPREDUCE-3431 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301502 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 13:37:26 +00:00
Steve Loughran	1188668648	MAPREDUCE-3970 not a big fix, an improvement ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301495 13f79535-47bb-0310-9956-ffa450edef68	2012-03-16 13:31:02 +00:00
Steve Loughran	8e5862e342	MAPREDUCE-3970 ServiceOperations class ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300901 13f79535-47bb-0310-9956-ffa450edef68	2012-03-15 10:45:35 +00:00
Steve Loughran	27dc31c103	MAPREDUCE-3970 ServiceOperations class ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300891 13f79535-47bb-0310-9956-ffa450edef68	2012-03-15 10:38:54 +00:00
Alejandro Abdelnur	fbae7714cf	Merge -r 1300749:1300750 from trunk to branch. FIXES: MAPREDUCE-4007 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300751 13f79535-47bb-0310-9956-ffa450edef68	2012-03-14 22:03:32 +00:00
Thomas Graves	275323b42f	merge -r 1297661:1297662 from trunk to branch-0.23. FIXES: MAPREDUCE-3974 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299773 13f79535-47bb-0310-9956-ffa450edef68	2012-03-12 18:27:35 +00:00
Suresh Srinivas	40276d7f78	HDFS-1623. Merging change r1296534 from trunk to 0.23 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299412 13f79535-47bb-0310-9956-ffa450edef68	2012-03-11 17:55:58 +00:00
Arun Murthy	cac1864734	Merge -c 1299100 from trunk to branch-0.23 to fix MAPREDUCE-3773. Add queue metrics with buckets for job run times. Contributed by Owen O'Malley. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299101 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 23:36:41 +00:00
Harsh J	95e8912bc0	svn merge -c 1299045. Merge MAPREDUCE-3991 into branch-0.23. (harsh) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299053 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 21:21:30 +00:00
Vinod Kumar Vavilapalli	07e7ad5e86	MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans. ... svn merge --ignore-ancestry -c 1299047 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 21:14:28 +00:00
Vinod Kumar Vavilapalli	c383843732	MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K. ... svn merge --ignore-ancestry -c 1298978 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 18:55:02 +00:00
Thomas White	4a151380c7	Merge -r 1298940:1298941 from trunk to branch-0.23. Fixes: MAPREDUCE-3578 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298942 13f79535-47bb-0310-9956-ffa450edef68	2012-03-09 17:38:10 +00:00
Robert Joseph Evans	b6d9e6b5f7	svn merge -c 1297825 from trunk to branch-0.23 FIXES: MAPREDUCE-3975. Default value not set for Configuration parameter mapreduce.job.local.dir (Eric Payne via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297826 13f79535-47bb-0310-9956-ffa450edef68	2012-03-07 01:28:34 +00:00
Robert Joseph Evans	9b32863cb8	svn merge -c 1297796 from trunk to branch-0.23 FIXES: MAPREDUCE-3977. LogAggregationService leaks log aggregator objects (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297797 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 23:46:02 +00:00
Robert Joseph Evans	de89bbcb88	svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 23:23:25 +00:00
Siddharth Seth	084f085b5f	merge MAPREDUCE-3944 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297673 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 19:53:09 +00:00
Tsz-wo Sze	74360b15d3	HADOOP-8142. Update versions from 0.23.2 to 0.23.3 in the build files. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297650 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 18:53:46 +00:00
Robert Joseph Evans	a7a9d16d63	svn merge -c 1297557 from trunk to branch-0.23 FIXES: MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297558 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 16:19:10 +00:00
Arun Murthy	3d48d8cf6e	Merge -c 1297310 from trunk to branch-0.23 to fix MAPREDUCE-3034. Ensure NodeManager reboots itself on direction from ResourceManager. Contributed by Devaraj K & Eric Payne. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297311 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 00:52:58 +00:00
Alejandro Abdelnur	a7899dae53	Merge -r 1297292:1297293 from trunk to branch. FIXES: MAPREDUCE-3952 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297299 13f79535-47bb-0310-9956-ffa450edef68	2012-03-06 00:00:36 +00:00
Robert Joseph Evans	68e54b192d	svn merge -c 1297248 from trunk to branch-0.23 FIXES MAPREDUCE-3964. ResourceManager does not have JVM metrics (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297250 13f79535-47bb-0310-9956-ffa450edef68	2012-03-05 22:05:00 +00:00
Vinod Kumar Vavilapalli	c0ecbbc7b4	MAPREDUCE-3954. Added new envs to separate heap size for different daemons started via bin scripts. Contributed by Robert Joseph Evans. ... svn merge --ignore-ancestry -c 1297174 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297176 13f79535-47bb-0310-9956-ffa450edef68	2012-03-05 19:06:43 +00:00
Vinod Kumar Vavilapalli	1719df92ab	MAPREDUCE-3009. Fixed node link on JobHistory webapp. Contributed by Chackaravarthy. ... svn merge --ignore-ancestry -c 1297149 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297150 13f79535-47bb-0310-9956-ffa450edef68	2012-03-05 18:31:23 +00:00
Arun Murthy	2d9f9c2d44	Merge -c 1296902 from trunk to branch-0.23 to fix MAPREDUCE-3497. Added docs for YARN CLI. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296903 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 23:51:48 +00:00
Arun Murthy	e11ab3382d	Merge -c 1296898 from trunk to branch-0.23 to fix MAPREDUCE-3897. Fixed computation of maxActiveAppsPerUser for queues by using capacity and not max-capacity since we are already scaling it by userLimitFactor. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296899 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 23:47:36 +00:00
Arun Murthy	991b24ea34	Merge -c 1296878 from trunk to branch-0.23 to fix MAPREDUCE-3960. Fix web-proxy to forward request to AM with configured hostname or IP. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296880 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 21:15:54 +00:00
Arun Murthy	83e260f273	Merge -c 1296835 from trunk to branch-0.23 to fix MAPREDUCE-3929. Fixed output of 'bin/mapred queue -showacl' command to clarify ACLs for users. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296836 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 17:16:19 +00:00
Vinod Kumar Vavilapalli	526f466d0c	MAPREDUCE-3614. Fixed MR AM to close history file quickly and send a correct final state to the RM when it is killed. Contributed by Ravi Prakash. ... svn merge --ignore-ancestry -c 1296747 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296748 13f79535-47bb-0310-9956-ffa450edef68	2012-03-04 05:25:07 +00:00
Vinod Kumar Vavilapalli	f942f395c1	MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe. ... svn merge --ignore-ancestry -c 1296721 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68	2012-03-03 23:42:39 +00:00
Thomas White	100d542625	Merge -r 1296522:1296523 from trunk to branch-23. Fixes: MAPREDUCE-3935. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296524 13f79535-47bb-0310-9956-ffa450edef68	2012-03-03 00:12:55 +00:00
Siddharth Seth	3e3e6770ca	merge MAPREDUCE-3896 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68	2012-03-02 19:29:14 +00:00
Siddharth Seth	2bfa09dc66	merge MAPREDUCE-3885 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295364 13f79535-47bb-0310-9956-ffa450edef68	2012-03-01 00:57:57 +00:00
Arun Murthy	66d7ab2789	Merge -c 1295314 from trunk to branch-0.23 to fix MAPREDUCE-3706. Fix circular redirect error in job-attempts page. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295315 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 22:16:05 +00:00
Siddharth Seth	c471c3d15f	merge MAPREDUCE-3903 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295263 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 20:50:02 +00:00
Alejandro Abdelnur	b0547e89e7	Merge -r 1295244:1295245 from trunk to branch. FIXES: MAPREDUCE-3728 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295246 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 20:06:19 +00:00
Alejandro Abdelnur	4e282dfc83	Merge -r 1295177:1295178 from trunk to branch. FIXES: MAPREDUCE-3933 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295179 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 16:21:42 +00:00
Thomas Graves	90c6dd8468	merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 15:51:55 +00:00
Robert Joseph Evans	cb6f468ddf	svn merge -c 1295147 trunk to branch 23 FIXES MAPREDUCE-3687. If AM dies before it returns new tracking URL, proxy redirects to http://N/A/ and doesn't return error code (Ravi Prakash via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295149 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 15:21:20 +00:00
Vinod Kumar Vavilapalli	cf56c58fd9	MAPREDUCE-3931. Changed PB implementation of LocalResource to take locks so that race conditions don't fail tasks by inadvertantly changing the timestamps. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1294970 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294973 13f79535-47bb-0310-9956-ffa450edef68	2012-02-29 04:58:35 +00:00
Siddharth Seth	4f586249ac	merge MAPREDUCE-3930 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294903 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 23:53:26 +00:00
Robert Joseph Evans	89b7a668be	svn merge -c 1294808 trunk to branch 0.23 FIXES MAPREDUCE-3816 capacity scheduler web ui bar graphs for used capacity wrong (tgraves via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294814 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 20:13:16 +00:00
Robert Joseph Evans	62c2cc6d97	svn merge -c 1294750 trunk to branch-0.23 FIXES MAPREDUCE-3790 Broken pipe on streaming job can lead to truncated output for a successful job (Jason Lowe via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294751 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 17:51:58 +00:00
Vinod Kumar Vavilapalli	75b043d69a	MAPREDUCE-3922. Fixed build to not compile 32bit container-executor binary by default on all platforms. Contributed by Hitesh Shah. ... svn merge --ignore-ancestry -c 1294446 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294448 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 02:43:15 +00:00
Vinod Kumar Vavilapalli	7808418f74	MAPREDUCE-2855. Passing a cached class-loader to ResourceBundle creator to minimize counter names lookup time. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1294436 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294437 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 01:25:46 +00:00
Vinod Kumar Vavilapalli	5240af9d20	MAPREDUCE-3901. Modified JobHistory records in YARN to lazily load job and task reports so as to improve UI response times. Contributed by Siddarth Seth. ... svn merge --ignore-ancestry -c 1294417 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294421 13f79535-47bb-0310-9956-ffa450edef68	2012-02-28 00:35:12 +00:00
Tsz-wo Sze	62c78369ba	Move MAPREDUCE-3740 to BUG FIXES in CHANGES.txt. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294326 13f79535-47bb-0310-9956-ffa450edef68	2012-02-27 21:02:51 +00:00
Steve Loughran	ee5978cf3a	MAPREDUCE-3909 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294220 13f79535-47bb-0310-9956-ffa450edef68	2012-02-27 16:53:35 +00:00
Thomas Graves	a291d9b72a	merge -r 1294206:1294207 from trunk to branch-0.23. FIXES: MAPREDUCE-3913 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294209 13f79535-47bb-0310-9956-ffa450edef68	2012-02-27 16:46:24 +00:00
Tsz-wo Sze	a05b3bda79	svn merge --reintegrate branch-0.23-PB back to 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294028 13f79535-47bb-0310-9956-ffa450edef68	2012-02-27 04:54:33 +00:00
Tsz-wo Sze	def75f7560	Merge r1293501 through r1293896 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68	2012-02-26 17:58:14 +00:00
Vinod Kumar Vavilapalli	3904d62d18	MAPREDUCE-3686. Fixed two bugs in Counters because of which web app displays zero counter values for framework counters. Contributed by Bhallamudi Venkata Siva Kamesh. ... svn merge --ignore-ancestry -c 1293775 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293776 13f79535-47bb-0310-9956-ffa450edef68	2012-02-26 08:33:34 +00:00
Vinod Kumar Vavilapalli	d4161fac0a	MAPREDUCE-3910. Fixed a bug in CapacityScheduler LeafQueue which was causing app-submission to fail. Contributed by John George. ... svn merge --ignore-ancestry -c 1293750 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293753 13f79535-47bb-0310-9956-ffa450edef68	2012-02-26 06:53:44 +00:00
Vinod Kumar Vavilapalli	1c7fb4f019	MAPREDUCE-2793. Reneabling commented out test from previous commit. ... svn merge --ignore-ancestry -c 1293521 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293522 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 02:31:59 +00:00
Vinod Kumar Vavilapalli	2b28bb962a	MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha. ... svn merge --ignore-ancestry -c 1293517 ../../trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 02:07:19 +00:00
Arun Murthy	c79ae7a8db	Moving branch-0.23 to version 0.23.3-SNAPSHOT ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 01:58:06 +00:00
Arun Murthy	ef628953a0	Preparing for 0.23.3 release. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293508 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 01:43:05 +00:00
Tsz-wo Sze	0654e46791	Merge r1293034 through r1293500 from 0.23. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293501 13f79535-47bb-0310-9956-ffa450edef68	2012-02-25 01:09:01 +00:00
Robert Joseph Evans	c5ee12af15	svn merge -c 1293469 trunk ot branch-0.23 FIXES MAPREDUCE-3918 proc_historyserver no longer in command line arguments for HistoryServer (Jon Eagles via bobby) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293470 13f79535-47bb-0310-9956-ffa450edef68	2012-02-24 23:01:32 +00:00
Thomas Graves	785573713c	merege -r 1293455:1293456 from trunk. FIXES: MAPREDUCE-3904 ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293459 13f79535-47bb-0310-9956-ffa450edef68	2012-02-24 22:33:31 +00:00