[
https://issues.apache.org/jira/browse/HBASE-7290?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13569580#comment-13569580
]
Ted Yu commented on HBASE-7290:
-------------------------------
I think we should go over the manual merges in the following files:
{code}
hbase-protocol/src/main/protobuf/hbase.proto
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase-server/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
hbase-server/src/main/java/org/apache/hadoop/hbase/MasterAdminProtocol.java
hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.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/StoreFile.java
hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
hbase-server/src/main/resources/hbase-default.xml
hbase-server/src/main/ruby/hbase/admin.rb
hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
{code}
> Online snapshots
> -----------------
>
> Key: HBASE-7290
> URL: https://issues.apache.org/jira/browse/HBASE-7290
> Project: HBase
> Issue Type: Bug
> Reporter: Jonathan Hsieh
> Assignee: Jonathan Hsieh
>
> HBASE-6055 will be closed when the offline snapshots pieces get merged with
> trunk. This umbrella issue has all the online snapshot specific patches.
> This will get merged once one of the implementations makes it into trunk.
> Other flavors of online snapshots can then be done as normal patches instead
> of on a development branch.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
