4 Commits

Author SHA1 Message Date
Steve Loughran
e71484be18 HADOOP-11412 POMs mention "The Apache Software License" rather than "Apache License". (Herve Boutemy via stevel)
(cherry picked from commit 07bb0b0bbb4732687c4992e8ce61a43ce8ba3db6)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:13 -08:00
Aaron T. Myers
66808e6aac HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
(cherry picked from commit 24d920b80eb3626073925a1d0b6dcf148add8cc0)

Conflicts:
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/BasicAWSCredentialsProvider.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInputStream.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AOutputStream.java
	hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/TestS3AContractRename.java
	hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml
2014-12-17 14:57:13 -08:00
Chris Nauroth
b928b8c775 HADOOP-10728. Metrics system for Windows Azure Storage Filesystem. 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@1605187 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0d91576ec31f63402f2db6107a04155368e2632d)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:12 -08: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 81bc395deb3ba00567dc067d6ca71bacf9e3bc82)

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