Jonathan M Hsieh 09a00efc0b Merge remote-tracking branch 'apache/master' (5/19/15) into hbase-11339 ... Patches that caused deltas: HBASE-10810 - around HColumnDescriptor 'should' vs 'is' api. HBASE-11677 - LOG was made private HBASE-11927 - Checksum constant changed HBASE-10800 - CellComparator instead of KVComparator Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreEngine.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java		2015-05-19 16:30:21 -07:00
..
src	Merge remote-tracking branch 'apache/master' (5/19/15) into hbase-11339	2015-05-19 16:30:21 -07:00
pom.xml	HBASE-13364 Make error prone off by default	2015-03-30 16:03:53 -07:00