Fixup on the hbasecon banner image.. add date and location

Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5d26f08
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5d26f08
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5d26f08

Branch: refs/heads/hbase-12439
Commit: d5d26f0804f0f6ed7feb4d23fbc1fddd189b2f71
Parents: 7b33a74
Author: stack <st...@apache.org>
Authored: Thu Feb 4 11:44:16 2016 -0800
Committer: stack <st...@apache.org>
Committed: Thu Feb 4 11:44:16 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/d5d26f08/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
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 0bc75eb..2bf4119 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.
    */

http://git-wip-us.apache.org/repos/asf/hbase/blob/d5d26f08/src/main/site/site.xml
----------------------------------------------------------------------
diff --git a/src/main/site/site.xml b/src/main/site/site.xml
index b847293..02b28ca 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>

Reply via email to