Commit Graph

281 Commits

Author SHA1 Message Date
Akira Ajisaka 121fcb74f3
HADOOP-13545. Update HSQLDB to 2.3.4. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit aabf08dd07)
2017-04-11 14:39:31 +09:00
Akira Ajisaka 21af5be51a
HADOOP-14290. Update SLF4J from 1.7.10 to 1.7.25.
(cherry picked from commit 5d38504071)
2017-04-09 01:48:03 +09:00
Jonathan Eagles 719ae5f2e8 HADOOP-14216. Improve Configuration XML Parsing Performance (jeagles) 2017-03-29 10:14:49 -05:00
Xiaobing Zhou dbdd97d057 HDFS-10394. move declaration of okhttp version from hdfs-client to hadoop-project POM. Contributed by Xiaobing Zhou. 2017-03-16 18:13:55 -07:00
Andrew Wang 6e75c1e2f0 HDFS-11498. Make RestCsrfPreventionHandler and WebHdfsHandler compatible with Netty 4.0.
(cherry picked from commit 5e74196ede)
2017-03-06 15:04:29 -08:00
Arpit Agarwal 9b947611a7 HADOOP-14100. Upgrade Jsch jar to latest version to fix vulnerability in old versions. Contributed by Vinayakumar B 2017-02-23 14:25:17 -08:00
Mingliang Liu b23e93d465 HADOOP-14040. Use shaded aws-sdk uber-JAR 1.11.86. Contributed by Steve Loughran and Sean Mackrory
(cherry picked from commit 658702efff)
2017-02-16 16:59:31 -08:00
Xiao Chen 67d2875f8f Revert "HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang."
This reverts commit f70b9d9241.
2017-01-26 14:21:17 -08:00
Junping Du 7b5b57e5b2 HADOOP-13958. Bump up release year to 2017. Contributed by Junping Du.
(cherry picked from commit 94f1d06f20)
2017-01-08 15:48:35 -08:00
Jason Lowe db947fb870 HADOOP-13578. Add Codec for ZStandard Compression. Contributed by churro morales 2017-01-04 14:46:44 +00:00
Akira Ajisaka 0c895e8a62 HADOOP-13812. Upgrade Tomcat to 6.0.48. Contributed by John Zhuge.
(cherry picked from commit 00096dcc0c)
2016-11-29 19:50:53 +09:00
Mingliang Liu cae4a8c05d HADOOP-13050. Upgrade to AWS SDK 10.11+. Contributed by Chris Nauroth and Steve Loughran 2016-11-22 14:05:58 -08:00
Steve Loughran 589596f6c7 HADOOP-12705 Upgrade Jackson 2.2.3 to 2.7.8 2016-11-21 16:16:14 +00:00
Mingliang Liu d064d5dbb2 HADOOP-13687. Provide a unified dependency artifact that transitively includes the cloud storage modules shipped with Hadoop. Contributed by Chris Nauroth
(cherry picked from commit 89354f0475)
2016-11-10 08:59:07 -08:00
Steve Loughran 381e516147 Revert "HADOOP-13514. Upgrade maven surefire plugin to 2.19.1. Contributed by Ewan Higgs."
This reverts commit 6bb23a14b6.
2016-10-27 15:20:50 +02:00
Steve Loughran 5d80b49602 Revert "Addendum patch for HADOOP-13514 Upgrade maven surefire plugin to 2.19.1. Contributed by Akira Ajisaka."
This reverts commit 0c96ceaca9.
2016-10-27 15:20:24 +02:00
Wei-Chiu Chuang 0c96ceaca9 Addendum patch for HADOOP-13514 Upgrade maven surefire plugin to 2.19.1. Contributed by Akira Ajisaka.
(cherry picked from commit e48b592f8b)
2016-10-26 14:09:55 -07:00
Benoy Antony b913b62aaf HADOOP-12082. Support multiple authentication schemes via AuthenticationFilter. Contributed by Hrishikesh Gadre. 2016-10-25 08:30:02 -07:00
Akira Ajisaka 6bb23a14b6 HADOOP-13514. Upgrade maven surefire plugin to 2.19.1. Contributed by Ewan Higgs.
(cherry picked from commit dbd205762e)
2016-10-25 15:58:19 +09:00
Steve Loughran 5f8b6f0313 HADOOP-13541 explicitly declare the Joda time version S3A depends on. Contributed by Stevel Loughran 2016-09-07 12:24:15 +01:00
Zhe Zhang dfcbc12026 HADOOP-12765. HttpServer2 should switch to using the non-blocking SslSelectChannelConnector to prevent performance degradation when handling SSL connections. Contributed by Min Shen. Branch-2 patch contributed by Wei-Chiu Chuang. 2016-08-23 14:46:08 -07:00
Chris Nauroth cda68de9b9 HADOOP-13446. Support running isolated unit tests separate from AWS integration tests. Contributed by Chris Nauroth. 2016-08-23 07:19:20 -07:00
Chris Nauroth 59eec8248a HADOOP-13354. Update WASB driver to use the latest version (4.2.0) of SDK for Microsoft Azure Storage Clients. Contributed by Sivaguru Sankaridurg.
(cherry picked from commit b43de80031)

Conflicts:
	hadoop-project/pom.xml
2016-07-27 15:52:07 -07:00
mattf-horton ea10e1384f HADOOP-13382. Remove unneeded commons-httpclient dependencies from POM files in Hadoop and sub-projects, while adding it in to the only place it is still needed, hadoop-openstack. Contributed by Matt Foley. 2016-07-21 15:58:05 -07:00
Akira Ajisaka 02b037f625 HADOOP-13297. Add missing dependency in setting maven-remote-resource-plugin to fix builds. Contributed by Sean Busbey.
(cherry picked from commit 7bd5d4272c)
2016-07-11 17:22:27 -07:00
Akira Ajisaka 6ffb557521 HADOOP-12893. Verify LICENSE.txt and NOTICE.txt. Contributed by Xiao Chen, Andrew Wang, and Akira Ajisaka. 2016-06-15 13:32:13 +09:00
Steve Loughran 6350e4b1fb HADOOP-12537 S3A to support Amazon STS temporary credentials. Contributed by Sean Mackrory. 2016-06-09 20:59:54 +01:00
Steve Loughran e29d7fb585 HADOOP-13145 In DistCp, prevent unnecessary getFileStatus call when not preserving metadata. Contributed by Chris Nauroth. 2016-05-20 12:21:47 +01:00
Allen Wittenauer f7ffa1a534 HADOOP-13177. Native tests fail on OS X, because DYLD_LIBRARY_PATH is not defined to include libhadoop.dylib (Chris Nauroth via aw)
(cherry picked from commit c7159f0240)
2016-05-19 09:58:48 -07:00
Steve Loughran 151ecdf26d HADOOP-12767. Update apache httpclient version to 4.5.2; httpcore to 4.4.4. Artem Aliev via stevel. 2016-05-19 14:44:44 +01:00
Li Lu 5c50c121aa HADOOP-13083. The number of javadocs warnings is limited to 100. (Gergely Novák via gtcarrera9)
(cherry picked from commit 3fa1380c22)
2016-05-13 13:45:05 -07:00
Junping Du 3d5ac829da YARN-4545. Allow YARN distributed shell to use ATS v1.5 APIs. Li Lu via junping_du
(cherry picked from commit f291d82cd4)
2016-03-14 08:30:07 -07:00
Robert Kanter a33109a0b8 MAPREDUCE-6627. Add machine-readable output to mapred job -history command (rkanter)
(cherry picked from commit 8eee59ce6b)
2016-02-18 17:58:40 -08:00
Steve Loughran 60474a769e HADOOP-12292. Make use of DeleteObjects optional. (Thomas Demoor via stevel) 2016-02-06 18:20:24 +00:00
Vinayakumar B 6ee66be2fa HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B)
(cherry picked from commit ddcd6954d03d3caadc8b69f7b886a3a17c3c9d0c)
2016-02-04 13:38:26 +05:30
Sangjin Lee b0ab6df079 HADOOP-12761. incremental maven build is not really incremental (sjlee)
(cherry picked from commit 4dc0a39493)
2016-02-03 09:00:41 -08:00
Akira Ajisaka cd5c66b080 HADOOP-7161. Remove unnecessary oro package from dependency management section. Contributed by Sean Busbey.
(cherry picked from commit 2ac39ca762)
2016-01-22 02:45:54 +09:00
Sangjin Lee 2dfa0613a1 MAPREDUCE-6577. MR AM unable to load native library without MR_AM_ADMIN_USER_ENV set (sjlee)
(cherry picked from commit f6f16118d3)
2016-01-05 15:25:47 -08:00
Vinod Kumar Vavilapalli b20e77eba3 Preparing for 2.9.0 development: mvn versions:set -DnewVersion=2.9.0 2015-11-25 17:47:22 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) c824920527 HADOOP-12577. Bumped up commons-collections version to 3.2.2 to address a security flaw. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 70c26703f4)
2015-11-23 10:00:40 -08:00
Sangjin Lee 7802248c23 HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) 2015-11-08 17:46:37 -08:00
Colin Patrick Mccabe f7e6a5dfb1 Revert "HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe)"
This reverts commit bb3b2977cd.
2015-11-05 11:11:27 -08:00
Colin Patrick Mccabe bb3b2977cd HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe)
(cherry picked from commit 482e35c55a)
2015-11-05 10:46:12 -08:00
Haohui Mai 9e911a2439 HDFS-9168. Move client side unit test to hadoop-hdfs-client. Contributed by Haohui Mai. 2015-10-28 15:54:53 -07:00
Tsuyoshi Ozawa 171e54e12c HADOOP-11515. Upgrade jsch lib to jsch-0.1.51 to avoid problems running on java7. (stevel and ozawa)
(cherry picked from commit 33fefa33e5)
2015-10-14 05:32:01 +09:00
Akira Ajisaka 966f9508c3 HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R. 2015-10-02 12:40:05 +02:00
Colin Patrick Mccabe 3b9d32627f HDFS-9080. Update htrace version to 4.0.1 (cmccabe)
(cherry picked from commit 892ade689f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
        hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/BlockStorageLocationUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
2015-09-28 08:15:00 -07:00
Vinayakumar B 1c7b3b98c1 HADOOP-11984. Enable parallel JUnit tests in pre-commit (Contributed by Chris Nauroth)
(cherry picked from commit f0f984e4e6)
2015-09-27 14:12:34 +05:30
Karthik Kambatla 999aa22509 MAPREDUCE-6415. Create a tool to combine aggregated logs into HAR files. (Robert Kanter via kasha) 2015-09-09 17:49:23 -07:00
Andrew Wang 7d833a3058 HADOOP-12369. Point hadoop-project/pom.xml java.security.krb5.conf within target folder.
(cherry picked from commit 0eb9b19325)
2015-09-01 10:59:39 -07:00
Andrew Wang 7a668981f5 HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. Contributed by Charlie Helin.
(cherry picked from commit 90fe7bcc3b)
2015-08-27 10:17:04 -07:00
Lei Xu f7b0f292e7 HADOOP-12269. Update aws-sdk dependency to 1.10.6 (Thomas Demoor via Lei (Eddy) Xu)
(cherry picked from commit d5403747b5)
2015-08-04 18:56:07 -07:00
cnauroth 5e8c01e7a2 HADOOP-12232. Upgrade Tomcat dependency to 6.0.44. Contributed by Chris Nauroth.
(cherry picked from commit 6b56f05b9ea3ee45abd5d00b14fab93a353b1332)
2015-07-14 15:22:39 -07:00
Chris Douglas 62424b5d99 HADOOP-5732. Add SFTPFileSystem. Contributed by Ramtin Boustani and Inigo Goiri
(cherry picked from commit 559425dcb9)
2015-07-07 10:09:29 -07:00
cnauroth 39f451e721 HADOOP-11959. WASB should configure client side socket timeout in storage client blob request options. Contributed by Ivan Mitic.
(cherry picked from commit 94e7d49a6d)

Conflicts:
	hadoop-project/pom.xml
2015-05-28 12:32:55 -07:00
Colin Patrick Mccabe 4b108a441d HADOOP-11894. Bump the version of Apache HTrace to 3.2.0-incubating (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit a1140959da)
2015-05-28 12:03:07 -07:00
Haohui Mai f70b9d9241 HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang. 2015-05-24 22:30:50 -07:00
Haohui Mai ed320da2ba HADOOP-11995. Make jetty version configurable from the maven command line. Contributed by Sriharsha Devineni. 2015-05-19 18:28:34 -07:00
Jonathan Eagles 9ed6b77da1 HADOOP-11889. Make checkstyle runnable from root project (Gera Shegalov via jeagles)
(cherry picked from commit 2d7363b273)

Conflicts:
	pom.xml
2015-05-01 19:04:41 -07:00
Tsuyoshi Ozawa bc979ff3bf HADOOP-11811. Fix typos in hadoop-project/pom.xml. Contributed by Brahma Reddy Battula.
(cherry picked from commit 174d8b3a10)
2015-04-13 07:00:33 -05:00
Owen O'Malley c16af2f6f8 HADOOP-11717. Support JWT tokens for web single sign on to the Hadoop
servers. (Larry McCay via omalley)
2015-04-07 08:17:10 -07:00
Vinod Kumar Vavilapalli 00854d2c2f HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. Contributed by Li Lu.
(cherry picked from commit 4b3948ea36)
2015-04-04 13:52:51 -07:00
Haohui Mai 1278310c21 HDFS-7893. Update the POM to create a separate hdfs-client jar. Contributed by Haohui Mai. 2015-04-02 15:39:40 -07:00
Xuan 498d775c9b YARN-3338. Exclude jline dependency from YARN. Contributed by Zhijie
Shen

(cherry picked from commit 06ce1d9a6c)
2015-03-12 10:25:55 -07:00
Vinod Kumar Vavilapalli d9416317a9 Preparing for 2.8.0 development. Changing SNAPSHOT version to be 2.8 on branch-2. 2015-03-08 20:32:51 -07:00
cnauroth 02cadbd24b HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. Contributed by Shashank Khandelwal and Ivan Mitic.
(cherry picked from commit 608ebd52ba)

Conflicts:
	hadoop-project/pom.xml
2015-03-06 15:29:22 -08:00
Jian He b8fe1a747e YARN-1514. Utility to benchmark ZKRMStateStore#loadState for RM HA. Contributed by Tsuyoshi OZAWA
(cherry picked from commit 1c03376300)
2015-02-18 16:34:42 -08:00
Karthik Kambatla fcf3dc5977 HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha)
(cherry picked from commit 55235d28c3)
2015-02-04 14:00:44 -08:00
Colin Patrick Mccabe 80381b62aa HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 09ad9a868a)
2015-01-30 16:02:36 -08:00
Akira Ajisaka 7411c74b11 HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka)
(cherry picked from commit 57b8950f37)

Conflicts:
	pom.xml
2015-01-30 02:27:36 +09:00
Tsuyoshi Ozawa 235a77fe1c HADOOP-11317. Increment SLF4J version to 1.7.10. Contributed by Tim Robertson.
(cherry picked from commit 20a4768397)
2015-01-28 21:55:33 +09:00
Chris Nauroth 82268d87bc HADOOP-9629. Support Windows Azure Storage - Blob as a file system in Hadoop. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601781 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 81bc395deb)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml
	hadoop-tools/hadoop-tools-dist/pom.xml
	hadoop-tools/pom.xml
2014-12-17 14:56:05 -08:00
Haohui Mai c9e9f82ec6 HADOOP-10476. Bumping the findbugs version to 3.0.0. Contributed by Haohui Mai. 2014-12-09 10:38:43 -08:00
Steve Loughran a7be36384a HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. 2014-12-09 11:04:59 +00:00
Steve Loughran 275561d848 HADOOP-10530 Make hadoop build on Java7+ only (stevel) 2014-12-08 15:30:34 +00:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Haohui Mai aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Haohui Mai 3bdfd6e58e HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. 2014-11-04 10:52:22 -08:00
Haohui Mai bbdd990864 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:54:04 -07:00
Steve Loughran d218ab58fc YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 12:55:47 -07:00
Kihwal Lee 7910c6d035 HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be)
2014-10-07 16:23:52 -05:00
Alejandro Abdelnur 897ced1a20 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu)
(cherry picked from commit db890eef32)

Conflicts:
	hadoop-project/pom.xml
2014-09-20 08:24:34 -07:00
Alejandro Abdelnur 5d897026e4 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:37:04 -07:00
Alejandro Abdelnur e59f6771e8 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:10:43 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
Colin Patrick Mccabe 5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
(cherry picked from commit 5ec7fcd9dd)
2014-09-11 15:00:47 -07:00
Steve Loughran fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
(cherry picked from commit 59384dfb71)
2014-09-11 11:43:52 -07:00
Karthik Kambatla 05ae7983c6 HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha)
(cherry picked from commit 9ad413b19d)
2014-08-29 15:57:29 -07:00
Alejandro Abdelnur 09a0ad328f HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu)
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
2014-08-29 11:53:13 -07:00
Alejandro Abdelnur 54202383a9 HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu)
(cherry picked from commit 6040810df82669f140033d3c6366892640798671)

Conflicts:
	hadoop-project/pom.xml
2014-08-29 11:23:14 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki.
(cherry picked from commit 6962510f72)
2014-08-27 14:17:29 -07:00
Alejandro Abdelnur d637c71e4d HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:53 +00:00
Alejandro Abdelnur 7a07873c28 HADOOP-10141. Create KeyProvider API to separate encryption key storage
from the applications. (omalley)


Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619506 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:24 +00:00
Alejandro Abdelnur 481ac00c65 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:01:12 +00:00
Steve Loughran 432e5eef56 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 14:06:05 +00:00
Uma Maheswara Rao G 5b832979e1 Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:53:42 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +00:00
Alejandro Abdelnur 602d3dd926 HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603645 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 21:50:49 +00:00
Chris Nauroth 74a6db7b27 HADOOP-9555. Merging change r1601709 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 18:05:22 +00:00