big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,437 Commits 2 Branches 2 Tags 264 MiB
f383fd9b6c
Commit Graph

251 Commits

Author SHA1 Message Date
Todd Lipcon
c7cd620fa4 HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528293 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 00:49:00 +00:00
Jason Darrell Lowe
db06f1bcb9 MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528237 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:34:31 +00:00
Alejandro Abdelnur
58b08e11b9 YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527059 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 20:23:19 +00:00
Steve Loughran
3caca924bc HADOOP-8545. Filesystem Implementation for OpenStack Swift 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526854 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 11:32:53 +00:00
Sanford Ryza
4402e2fcef HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526667 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 20:24:58 +00:00
Chris Nauroth
ef62869338 HADOOP-9935. Revert from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523839 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 23:20:23 +00:00
Alejandro Abdelnur
9fe18b50dd HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523599 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 11:37:15 +00:00
Alejandro Abdelnur
27e7feb777 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523596 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 11:30:47 +00:00
Chris Nauroth
c4ea83c642 HADOOP-9935. set junit dependency to test scope. Contributed by André Kelpe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523403 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 04:36:48 +00:00
Aaron Myers
597c57ba2a HADOOP-9960. Upgrade Jersey version to 1.9. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523155 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-14 00:12:43 +00:00
Chris Nauroth
5eb618ee1f HDFS-4491. Parallel testing HDFS. Contributed by Andrey Klochkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520479 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 03:06:41 +00:00
Sanford Ryza
f6a1f4d1e0 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1515711 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 06:24:22 +00:00
Alejandro Abdelnur
8451ab5c01 HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514068 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:15:04 +00:00
Alejandro Abdelnur
1d1ab587e4 HADOOP-9848. Create a MiniKDC for use with security testing. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513308 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-13 00:23:10 +00:00
Alejandro Abdelnur
19b36f0900 HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513281 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-12 22:15:10 +00:00
Chris Nauroth
1fafb1e1e0 HADOOP-9802. Support Snappy codec on Windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512872 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-11 05:51:34 +00:00
Chris Nauroth
49e440c404 HADOOP-9857. Tests block and sometimes timeout on Windows due to invalid entropy source. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512522 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 22:55:11 +00:00
Kihwal Lee
52f11f7091 HADOOP-9672. Upgrade Avro dependency to 1.7.4. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512314 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 14:12:11 +00:00
Steve Loughran
f702e1c8e5 HADOOP-9833 move slf4j to version 1.7.5 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512026 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-08 20:54:17 +00:00
Brandon Li
70e9e58ff3 Add the missed file in commit r1499029 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499041 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 18:03:59 +00:00
Arun Murthy
423f2b14ac HADOOP-9517. Documented various aspects of compatibility for Apache Hadoop. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493693 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 09:32:27 +00:00
Arun Murthy
7f96128e43 MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493570 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 19:09:48 +00:00
Jason Darrell Lowe
85623a2d75 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488040 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 22:43:16 +00:00
Konstantin Boudnik
9f551fa542 HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487980 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 19:09:26 +00:00
Tsz-wo Sze
3ecf94e2b7 Merge r1480440 through r1480820 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1480824 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 22:46:39 +00:00
Alejandro Abdelnur
f569c8a2a5 HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480781 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 21:27:33 +00:00
Tsz-wo Sze
faca77f227 Merge r1476453 through r1477867 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1477868 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 23:02:35 +00:00
Suresh Srinivas
fe3853484e HADOOP-9290. Some tests cannot load native library on windows. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476586 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:24:02 +00:00
Tsz-wo Sze
cb229db4bd HDFS-4708. Add snapshot user documentation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470665 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-22 19:13:18 +00:00
Thomas Graves
7049c83d0e HADOOP-9469. mapreduce/yarn source jars not included in dist tarball (Robert Parker via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470047 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 21:18:05 +00:00
Todd Lipcon
c45c8ee720 Complete commit of prior merge. 
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 16:47:16 +00:00
Alejandro Abdelnur
bc6cc3d961 HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456729 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-15 00:27:40 +00:00
Suresh Srinivas
20604b36a7 HADOOP-9407. commons-daemon 1.0.3 dependency has bad group id causing build issues. Contributed by Sangjin Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1456704 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-14 22:32:04 +00:00
Suresh Srinivas
638801cce1 HADOOP-8952. Enhancements to support Hadoop on Windows Server and Windows Azure environments. Contributed by Ivan Mitic, Chuan Liu, Ramya Sunil, Bikas Saha, Kanna Karanam, John Gordon, Brandon Li, Chris Nauroth, David Lao, Sumadhur Reddy Bolli, Arpit Agarwal, Ahmed El Baz, Mike Liddell, Jing Zhao, Thejas Nair, Steve Maine, Ganeshan Iyer, Raja Aluri, Giridharan Kesavan, Ramya Bharathi Nimmagadda. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453486 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 19:15:18 +00:00
Suresh Srinivas
70b1c5ca75 HADOOP-9334. Upgrade netty version. Contributed by Nicolas Liochon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1450463 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-26 21:54:25 +00:00
Aaron Myers
f61581501a Merge trunk into HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-16 01:12:07 +00:00
Thomas Graves
576f789385 HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445635 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-13 14:49:35 +00:00
Aaron Myers
aa92072b54 HDFS-4453. Make a simple doc to describe the usage and design of the shortcircuit read feature. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1444963 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-11 21:10:23 +00:00
Alejandro Abdelnur
17e72be6d8 MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443168 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:52:25 +00:00
Suresh Srinivas
ae270e72cf HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. Contributed by Alejandro Abdelnur and Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435380 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 22:35:58 +00:00
Suresh Srinivas
f8cca2df8a HADOOP-8924. Revert r1435372 that missed some files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435379 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 22:32:49 +00:00
Suresh Srinivas
98db9f5930 HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. Contributed by Alejandro Abdelnur and Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1435372 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 22:18:12 +00:00
Alejandro Abdelnur
b324a6134e HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1424459 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-20 13:41:43 +00:00
Thomas White
e464607b7d YARN-129. Simplify classpath construction for mini YARN tests. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1411235 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 15:12:22 +00:00
Alejandro Abdelnur
9d5205aadd HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. (tomwhite via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1407658 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-09 21:44:00 +00:00
Alejandro Abdelnur
a4f30ff53c reverting commit 1399898 (HADOOP-8887) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399972 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-19 05:38:26 +00:00
Alejandro Abdelnur
53c598ab11 HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399898 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-18 22:40:41 +00:00
Robert Joseph Evans
f91a2cb14d HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399426 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-17 20:49:44 +00:00
Todd Lipcon
ff8f84ccf6 Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1396918 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-11 06:14:26 +00:00
Todd Lipcon
d974127cf2 HADOOP-8889. Upgrade to Surefire 2.12.3. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1394881 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-06 00:58:50 +00:00
Eli Collins
f8f79a02aa HDFS-3753. Tests don't run with native libraries. Contributed by Colin Patrick McCabe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1393113 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-02 19:13:53 +00:00
Aaron Myers
c908f960c9 HADOOP-8851. Use -XX:+HeapDumpOnOutOfMemoryError JVM option in the forked tests. Contributed by Ivan A. Veselovsky. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1392466 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-01 17:44:23 +00:00
Aaron Myers
853db9ec24 HDFS-3926. QJM: Add user documentation for QJM. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1384595 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-13 23:02:32 +00:00
Siddharth Seth
10e704c50b YARN-29. Add a yarn-client module. (Contributed by Vinod Kumar Vavilapalli) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377781 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-27 18:27:18 +00:00
Eli Collins
c959c1ac75 HADOOP-8687. Upgrade log4j to 1.2.17. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372649 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-13 22:08:39 +00:00
Alejandro Abdelnur
117145f1ad MAPREDUCE-4498. Remove hsqldb jar from Hadoop runtime classpath. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1369906 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 18:14:47 +00:00
Robert Joseph Evans
27eb14c3c3 MAPREDUCE-4483. 2.0 build does not work (John George via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367726 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-31 19:43:51 +00:00
Alejandro Abdelnur
9d16c9354b MAPREDUCE-4417. add support for encrypted shuffle (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365979 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-26 13:23:05 +00:00
Eli Collins
370c65f282 Revert MAPREDUCE-3868. Reenable Raid. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363572 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-19 22:30:36 +00:00
Robert Joseph Evans
26910fd058 MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360735 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-12 15:52:12 +00:00
Robert Joseph Evans
46aad80001 HADOOP-8535. Cut hadoop build times in half (Job Eagles via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1355019 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-28 14:22:23 +00:00
Scott Chun-Yang Chen
277b3dd736 MAPREDUCE-3868. Make Raid Compile. (Weiyan Wang via schen) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1351548 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-19 00:55:28 +00:00
Thomas Graves
0e7214933d HADOOP-8495. Update Netty to avoid leaking file descriptors during shuffle (Jason Lowe via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1351363 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-18 14:42:25 +00:00
Eli Collins
df57680b5f HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1347133 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-06 21:14:15 +00:00
Harsh J
1fab229f30 HADOOP-8268. A few pom.xml across Hadoop project may fail XML validation. Contributed by Radim Kolar. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1343272 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-28 14:51:05 +00:00
Thomas Graves
dcf84707ab MAPREDUCE-3543. Mavenize Gridmix. (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1339629 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-17 15:06:33 +00:00
Thomas Graves
f35294eb95 MAPREDUCE-4238. mavenize data_join. (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1338835 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-15 19:09:59 +00:00
Robert Joseph Evans
934f466bab HADOOP-8317. Update maven-assembly-plugin to 2.3 - fix build on FreeBSD (Radim Kolar via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1332775 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-01 18:51:58 +00:00
Thomas White
bcfb66ebb2 MAPREDUCE-4193. broken doc link for yarn-default.xml in site.xml. Contributed by Patrick Hunt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1330427 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-25 17:20:00 +00:00
Alejandro Abdelnur
1ac0171b2b HADOOP-8284. clover integration broken, also mapreduce poms are pulling in clover as a dependency. (phunt via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1329490 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-23 22:30:48 +00:00
Todd Lipcon
2d370ef2ba HADOOP-8117. Upgrade test build to Surefire 2.12. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1326802 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-16 21:14:23 +00:00
Thomas Graves
f843f590f1 HADOOP-8180. Remove hsqldb since its not needed from pom.xml (Ravi Prakash via tgraves 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1310036 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-05 19:38:45 +00:00
Alejandro Abdelnur
1d6038ecfb MAPREDUCE-4097. tools testcases fail because missing mrapp-generated-classpath file in classpath (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309583 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-04 20:24:01 +00:00
Todd Lipcon
9972a9633d HDFS-3187. Upgrade guava to 11.0.2. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1309181 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-03 22:30:29 +00:00
Eli Collins
eacd9abf50 HADOOP-8211. Update commons-net version to 3.1. Contributed by Eli Collins 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308006 13f79535-47bb-0310-9956-ffa450edef68
 2012-04-01 02:52:15 +00:00
Arun Murthy
67a74198b1 Changed version in trunk to 3.0.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1306200 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-28 07:37:06 +00:00
Arun Murthy
7819483b9d HADOOP-8137. Added links to CLI manuals to the site. Contributed by Thomas Graves. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296905 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-04 23:54:48 +00:00
Arun Murthy
9f16abfd63 HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project. Contributed by Jonathan Eagles. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1296861 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-04 19:37:11 +00:00
Todd Lipcon
1ba357553a Merge trunk into HA branch. 
Resolved some semantic conflicts in TestFileAppendRestart - we now log more OP_ADDs in the HA branch than we did in trunk.
Resolved some conflicts around removal of VersionedProtocol, etc.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1295342 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-29 23:47:49 +00:00
Alejandro Abdelnur
a4ad12dd2d MAPREDUCE-3933. Failures because MALLOC_ARENA_MAX is not set (ahmed via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1295178 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-29 16:20:40 +00:00
Alejandro Abdelnur
f83be7cb21 HADOOP-8104. Inconsistent Jackson versions (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1294784 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-28 18:59:44 +00:00
Aaron Myers
53b7d6c6bc Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245690 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-17 18:19:31 +00:00
Alejandro Abdelnur
482f11a578 HADOOP-8083 javadoc generation for some modules is not done under target/ (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245321 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-17 05:50:11 +00:00
Alejandro Abdelnur
d686027c2e HADOOP-8066 The full docs build intermittently fails (abayer via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245250 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-16 23:22:43 +00:00
Aaron Myers
833e96534f Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1245117 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-16 18:35:32 +00:00
Alejandro Abdelnur
eb80104c19 HADOOP-8082 add hadoop-client and hadoop-minicluster to the dependency-management section. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245110 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-16 18:13:23 +00:00
Todd Lipcon
db187cf40e Merge trunk into HA branch. 
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1243691 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-13 21:00:37 +00:00
Mahadev Konar
5c46ba4d48 MAPREDUCE-3852. Test TestLinuxResourceCalculatorPlugin failing. (Thomas Graves via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243418 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-13 05:37:11 +00:00
Alejandro Abdelnur
27035f532d HADOOP-8051 HttpFS documentation it is not wired to the generated site (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242987 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-11 00:03:00 +00:00
Todd Lipcon
c14bb61a82 Merge trunk into HA branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1242635 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-10 01:49:08 +00:00
Alejandro Abdelnur
4b09ebde5b HADOOP-8035 Hadoop Maven site is inefficient and runs phases redundantly (abayer via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242505 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-09 20:26:19 +00:00
Aaron Myers
db7c013877 HDFS-2733. Document HA configuration and CLI. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1241183 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-06 21:18:11 +00:00
Mahadev Konar
2c32cd7008 MAPREDUCE-3791. can't build site in hadoop-yarn-server-common. (mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240587 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-04 18:41:50 +00:00
Robert Joseph Evans
fdc47f7833 HADOOP-8018 Hudson auto test for HDFS has started throwing javadoc (Jon Eagles via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240232 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-03 16:24:30 +00:00
Tsz-wo Sze
42d1c9b251 HADOOP-7470. Move up to Jackson 1.8.8. Contributed by Enis Soztutar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239386 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 22:55:59 +00:00
Aaron Myers
2b2e56056e Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236936 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-28 00:21:07 +00:00
Mahadev Konar
af6448e543 MAPREDUCE-3737. The Web Application Proxy's is not documented very well. (Robert Evans via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236371 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 20:10:50 +00:00
Mahadev Konar
faa6806df3 MAPREDUCE-3735. Add distcp jar to the distribution (tar). (mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236336 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 18:10:11 +00:00
Aaron Myers
1c95060a72 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1236333 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 18:03:46 +00:00
Mahadev Konar
d06948002f MAPREDUCE-2765. DistCp Rewrite. (Mithun Radhakrishnan via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236045 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-26 06:36:52 +00:00
Aaron Myers
e42bbfbca2 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1234924 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 18:07:27 +00:00
Mahadev Konar
8a1719e999 MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234222 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-21 00:53:02 +00:00
Aaron Myers
6177bf6c8f Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1233105 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-18 23:02:17 +00:00
Alejandro Abdelnur
10325d9732 MAPREDUCE-3582. Move successfully passing MR1 tests to MR2 maven tree.(ahmed via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233090 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-18 22:10:12 +00:00
Aaron Myers
d680080da0 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1228339 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 18:47:05 +00:00
Alejandro Abdelnur
b3bcbe274d HADOOP-7907. hadoop-tools JARs are not part of the distro. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227901 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-06 00:02:04 +00:00
Alejandro Abdelnur
6d45b9e31d HADOOP-7934. Normalize dependencies versions across all modules. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227787 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-05 19:46:42 +00:00
Todd Lipcon
b77c107ccb Committing rest of merge from trunk (accidentally only committed the HDFS portion before) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214546 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 23:34:04 +00:00
Doug Cutting
3758710bff HADOOP-7920. Remove a few more bits that are no longer required. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214499 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 21:57:55 +00:00
Aaron Myers
a0fe4f476a Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213867 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 19:02:37 +00:00
Tsz-wo Sze
40cc6fc292 HADOOP-7914. Remove the duplicated declaration of hadoop-hdfs test-jar in hadoop-project/pom.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213598 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-13 08:47:47 +00:00
Aaron Myers
89379bc1a3 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213389 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-12 19:41:20 +00:00
Alejandro Abdelnur
3334306512 HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212060 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 19:25:28 +00:00
Aaron Myers
73b3de6204 Merge trunk into HA branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1207490 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 18:21:46 +00:00
Tsz-wo Sze
d3a51478e3 HDFS-2587. Add apt doc for WebHDFS REST API. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205626 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-23 22:02:19 +00:00
Todd Lipcon
6a0671977b Merge trunk into HDFS-1623 branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1204794 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-22 03:18:47 +00:00
Todd Lipcon
796d308637 HADOOP-7841. Run tests with non-secure random. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204360 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-21 06:08:39 +00:00
Alejandro Abdelnur
26447229ba HADOOP-7590. Mavenize streaming and MR examples. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1203941 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-19 01:24:32 +00:00
Aaron Myers
571d7990f4 Merge trunk into HA branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1196458 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-02 05:34:31 +00:00
Arun Murthy
073210043d HADOOP-7789. Fixed site to include yarn-default.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1196411 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-02 00:50:41 +00:00
Arun Murthy
eee85adecf HADOOP-7789. Minor edits to add CHANGES.txt and yarn-default.xml to the site. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1196328 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-01 22:21:41 +00:00
Arun Murthy
1112a50ad3 HADOOP-7789. Improvements to site navigation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195876 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-01 08:53:38 +00:00
Thomas White
8e04fa8b84 HADOOP-7782. Aggregate project javadocs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195817 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-01 04:47:10 +00:00
Thomas White
cd77a1668f HADOOP-7763. Add top-level navigation to APT docs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1190703 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 00:16:16 +00:00
Alejandro Abdelnur
49baada6cc MAPREDUCE-3204. mvn site:site fails on MapReduce. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1187062 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-20 21:38:58 +00:00
Alejandro Abdelnur
15a1d9af19 MAPREDUCE-3003. Publish MR JARs to Maven snapshot repository. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1185286 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-17 17:06:42 +00:00
Mahadev Konar
5a71f004e9 HADOOP-7709. Running a set of methods in a Single Test Class. (Jonathan Eagles via mahadev) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1182686 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-13 06:56:37 +00:00
Alejandro Abdelnur
3f998db918 HADOOP-7642. create hadoop-dist module where TAR stitching would happen. Contributed by Thomas White. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1182151 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-12 00:27:32 +00:00
Alejandro Abdelnur
4972959173 Reverted MAPREDUCE-3003 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180283 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-08 00:38:41 +00:00
Alejandro Abdelnur
68d1162f7a MAPREDUCE-3003. Publish Yarn and MapReduce artifacts to Maven snapshot repository. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1180155 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-07 19:01:01 +00:00
Suresh Srinivas
ab0402bc1d Merging trunk to HDFS-1623 branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1177130 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-29 00:42:47 +00:00
Suresh Srinivas
9992cae541 Reverting the previous trunk merge since it added other unintended changes in addition 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1177127 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-29 00:33:34 +00:00
Suresh Srinivas
122113922f Merging trunk to HDFS-1623 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1177117 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-29 00:09:56 +00:00
Aaron Myers
83e4b2b469 HADOOP-7621. alfredo config should be in a file not readable by users (Alejandro Abdelnur via atm) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1173739 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-21 16:09:44 +00:00
Todd Lipcon
d10631f728 Merge trunk into HA branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1166495 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 01:39:07 +00:00
Aaron Myers
6c33846767 HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required by Jersey (Alejandro Abdelnur via atm) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1164779 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-03 00:53:40 +00:00
Aaron Myers
a2b1aa9471 HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1164174 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-01 17:13:44 +00:00
Tsz-wo Sze
19523b6a2b HADOOP-7594. Support HTTP REST in HttpServer. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1163858 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-31 22:58:03 +00:00
Tsz-wo Sze
2b016dac82 HADOOP-7579. Rename package names from alfredo to auth. Contributed by Alejandro Abdelnur 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1163852 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-31 22:40:03 +00:00
Arun Murthy
8b56463315 HDFS-2289. Ensure jsvc is bundled with the HDFS distribution artifact. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1162421 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-27 19:07:04 +00:00
Todd Lipcon
5116ea4487 Merge trunk into HA branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1162279 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-26 22:46:17 +00:00
Arun Murthy
a44ffcc0be Preparing for hadoop-0.24.0 development. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161736 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-25 20:32:04 +00:00
Aaron Myers
a0f120ce68 HADOOP-7119. add Kerberos HTTP SPNEGO authentication support to Hadoop JT/NN/DN/TT web-consoles. (Alejandro Abdelnur via atm) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1159804 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-19 22:31:06 +00:00
Todd Lipcon
b0ea4b71c9 Merge trunk into HDFS-1623 post-mavenization. 
- added CHANGES.HDFS-1623.txt to findbugs exclude
- added jsch dependency


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1159782 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-19 20:47:40 +00:00
Thomas White
d86f3183d9 HDFS-2096. Mavenization of hadoop-hdfs. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1159702 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-19 17:36:23 +00:00
Thomas White
6ee5a73e0e HADOOP-7264. Bump avro version to at least 1.4.1. Contributed by Alejandro Abdelnur 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1159699 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-19 17:26:42 +00:00
Thomas White
86ef57ff07 HADOOP-7536. Correct the dependency version regressions introduced in HADOOP-6671. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1158347 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-16 16:12:04 +00:00
Thomas White
0a2b40fad5 HADOOP-7528. Maven build fails in Windows. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1155448 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-09 18:03:00 +00:00
Giridharan Kesavan
3864369a58 HADOOP-7520. Fix to add distribution management info to hadoop-main. Contributed by Alejandro Abdelnur 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1154350 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-05 18:47:53 +00:00
Thomas White
2db9aab9d7 HADOOP-7501. Publish Hadoop Common artifacts (post HADOOP-6671) to Apache SNAPSHOTs repo. Contributed by Alejandro Abdelnur 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1153597 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 17:52:00 +00:00