Jonathan M Hsieh fe335b683c Merge branch 'master' (2/11/15) into hbase-11339 ...

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
	hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java
	hbase-common/src/main/java/org/apache/hadoop/hbase/TagType.java
	hbase-common/src/main/resources/hbase-default.xml
	hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
	hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
	hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/io/HFileLink.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/DisabledTableSnapshotHandler.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreEngine.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
	hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java
	hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java
	pom.xml
	src/main/docbkx/book.xml
	src/main/docbkx/ops_mgt.xml
	src/main/docbkx/schema_design.xml

2015-02-22 12:54:45 -08:00

..

src

Merge branch 'master' (2/11/15) into hbase-11339

2015-02-22 12:54:45 -08:00

pom.xml

HBASE-12898 ensure direct dependencies are declared.

2015-01-22 14:33:25 -06:00