From 5dd1149f72717c9e7b6cb4c556d85b0abf32a9ba Mon Sep 17 00:00:00 2001
From: James Michael DuPont <JamesMikeDuPont@gmail.com>
Date: Sat, 20 Feb 2016 17:32:04 -0500
Subject: [PATCH 1/2] for archive.org

---
 hadoop-tools/hadoop-aws/pom.xml                            | 1 +
 .../main/java/org/apache/hadoop/fs/s3/S3Credentials.java   | 7 ++++---
 .../hadoop/fs/s3native/Jets3tNativeFileSystemStore.java    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index eb87d77b7cc91..a2bbaadb57df8 100644
--- a/hadoop-tools/hadoop-aws/pom.xml
+++ b/hadoop-tools/hadoop-aws/pom.xml
@@ -111,6 +111,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+      <version>2.7.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
index fdacc3ff751de..800d27a6175b4 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
@@ -44,9 +44,10 @@ public class S3Credentials {
    *                     to talk to them.
    */
   public void initialize(URI uri, Configuration conf) throws IOException {
-    if (uri.getHost() == null) {
-      throw new IllegalArgumentException("Invalid hostname in URI " + uri);
-    }
+	  // How can the s3 url have a host?
+	  if (uri.getAuthority() == null) {
+	        	throw new IllegalArgumentException("Invalid hostname in URI " + uri);
+	  }
     
     String userInfo = uri.getUserInfo();
     if (userInfo != null) {
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
index a10d6f284fbea..6c747c38a8b5a 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
@@ -96,7 +96,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
         MAX_PART_SIZE);
     serverSideEncryptionAlgorithm = conf.get("fs.s3n.server-side-encryption-algorithm");
 
-    bucket = new S3Bucket(uri.getHost());
+    bucket = new S3Bucket(uri.getAuthority());
   }
   
   @Override

From c3deceec48d9a87d838236f030e36710832ef219 Mon Sep 17 00:00:00 2001
From: James Michael DuPont <JamesMikeDuPont@gmail.com>
Date: Sat, 20 Feb 2016 17:42:59 -0500
Subject: [PATCH 2/2] revert version problem

---
 hadoop-tools/hadoop-aws/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml
index a2bbaadb57df8..eb87d77b7cc91 100644
--- a/hadoop-tools/hadoop-aws/pom.xml
+++ b/hadoop-tools/hadoop-aws/pom.xml
@@ -111,7 +111,6 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.7.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>