From d5d26f0804f0f6ed7feb4d23fbc1fddd189b2f71 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Thu, 4 Feb 2016 11:44:16 -0800
Subject: [PATCH] Fixup on the hbasecon banner image.. add date and location

---
 .../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 6 +++---
 src/main/site/site.xml                                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index 0bc75eb8e9c..2bf41198522 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -317,7 +317,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
           if (perms != Perms.ALL) {
             if (LOG.isDebugEnabled()) {
               LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x",
-                id, perms, Perms.ALL));
+                id.toString(), perms, Perms.ALL));
             }
             return false;
           }
@@ -336,7 +336,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
     }
     return true;
   }
-  
+
   /*
    * Validate whether ACL set for all superusers.
    */
@@ -366,7 +366,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
     }
     return true;
   }
-  
+
   /*
    * Validate whether ACL ID is superuser.
    */
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
index b84729318f0..02b28ca404f 100644
--- a/src/main/site/site.xml
+++ b/src/main/site/site.xml
@@ -48,7 +48,7 @@
     <height>0</height>
     <width>0</width>
     -->
-    <src>images/hbasecon2016-stack-logo.jpg</src>
+    <src>images/hbasecon2016-stacked.png</src>
     <href>http://hbasecon.com/</href>
   </bannerLeft>
   <bannerRight>