Merge branch 'trunk' of git://github.com/apache/hbase into clean
Merge branch 'clean' of https://github.com/nkeywal/hbase into clean
Merge branch 'trunk' of git://github.com/apache/hbase into clean
Merge branch 'trunk' of git://github.com/apache/hbase into clean
Merge branch 'clean' of https://github.com/nkeywal/hbase into clean
HBASE-7757 Add web UI to REST server and Thrift server

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443069 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7773. Rename StoreConfiguration, remove unnecessary method (Sergey Shelukhin)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443165 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7772 Cluster ID is not initialized correctly in RPC client

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443221 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7768. Zkcluster in local mode not seeing configurations in hbase-{site|default}.xml

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443234 13f79535-47bb-0310-9956-ffa450edef68
HBASE-4676 Prefix Compression - Trie data block encoding (Matt Corgan)



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1443289 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of https://github.com/apache/hbase into clean
Merge branch 'clean' into fw_client

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
Merge branch 'clean' into fw_client

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
Merge branch 'clean' of https://github.com/nkeywal/hbase into clean
Merge branch 'clean' into fw_client

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
Merge branch 'clean' into fw_client

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
a
v0