HBASE 1961; missing hunks from last commit
HBASE 1961; missing hunks from last commit

git-svn-id: 25ca64b629f24bdef6d1cceac138f74b13f55e41@881186 13f79535-47bb-0310-9956-ffa450edef68

jyates/hbase,centiteo/hbase,jyates/hbase,lichongxin/hbase-snapshot,StumbleUponArchive/hbase,francisliu/hbase_namespace,Shmuma/hbase-trunk,Shmuma/hbase-trunk,StumbleUponArchive/hbase,ryanobjc/hbase,ryanobjc/hbase,francisliu/hbase_namespace,centiteo/hbase,Shmuma/hbase-trunk,bcopeland/hbase-thrift,jyates/hbase,bcopeland/hbase-thrift,matteobertozzi/hbase,lichongxin/hbase-snapshot,StumbleUponArchive/hbase,optimizely/hbase,jyates/hbase,StumbleUponArchive/hbase,centiteo/hbase,StumbleUponArchive/hbase,jyates/hbase,matteobertozzi/hbase,matteobertozzi/hbase,francisliu/hbase_namespace,francisliu/hbase_namespace,bcopeland/hbase-thrift,Shmuma/hbase-trunk,centiteo/hbase,StumbleUponArchive/hbase,StumbleUponArchive/hbase,bcopeland/hbase-thrift,cloudera/hbase,lichongxin/hbase-snapshot,cloudera/hbase,jyates/hbase,optimizely/hbase,centiteo/hbase,optimizely/hbase,francisliu/hbase_namespace,francisliu/hbase_namespace,matteobertozzi/hbase,ryanobjc/hbase,optimizely/hbase,ryanobjc/hbase,Shmuma/hbase-trunk,lichongxin/hbase-snapshot,cloudera/hbase,matteobertozzi/hbase,optimizely/hbase,matteobertozzi/hbase,Shmuma/hbase-trunk,jyates/hbase,matteobertozzi/hbase,centiteo/hbase,lichongxin/hbase-snapshot,francisliu/hbase_namespace,bcopeland/hbase-thrift,lichongxin/hbase-snapshot,ryanobjc/hbase,cloudera/hbase,bcopeland/hbase-thrift,francisliu/hbase_namespace,jyates/hbase,cloudera/hbase,francisliu/hbase_namespace,Shmuma/hbase-trunk,jyates/hbase,matteobertozzi/hbase,centiteo/hbase,cloudera/hbase,optimizely/hbase,matteobertozzi/hbase,ryanobjc/hbase,bcopeland/hbase-thrift