You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sb...@apache.org on 2019/02/11 19:25:52 UTC

[trafodion] branch master updated (1262fd9 -> edbcda0)

This is an automated email from the ASF dual-hosted git repository.

sbroeder pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git.


    from 1262fd9  Merge pull request #1790 from apache/sean_traf_2.4
     add 9aad245  Merge branch 'master' of github.com:apache/trafodion into sean_traf_2.4
     add 097d52c  Fix for [Trafodion-3244] Need to provide support for HDP 2.5.x and 2.6.x Various files needed to correctly build modified protos and remain backward compatible
     add 2c398b0  Adding apache license to generated protobuf files
     add 0ad7cf3  Added Apache license to new file copy_proto
     add 53a3e45  White space adjustment
     new edbcda0  Merge pull request #1792 from apache/sean_traf_2.4

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/sqf/src/seatrans/hbase-trx/Makefile           |  198 +-
 core/sqf/src/seatrans/hbase-trx/copy_proto         |   35 +
 core/sqf/src/seatrans/hbase-trx/genvers            |    2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    0
 .../README.txt                                     |    2 +-
 .../google/protobuf/HBaseZeroCopyByteString.java   |    0
 .../protobuf/generated/AccessControlProtos.java    |    0
 .../hbase/protobuf/generated/AdminProtos.java      |    0
 .../hbase/protobuf/generated/AggregateProtos.java  |    0
 .../protobuf/generated/AuthenticationProtos.java   |    0
 .../hbase/protobuf/generated/CellProtos.java       |    0
 .../hbase/protobuf/generated/ClientProtos.java     |    0
 .../hbase/protobuf/generated/ClusterIdProtos.java  |    0
 .../protobuf/generated/ClusterStatusProtos.java    |    0
 .../hbase/protobuf/generated/ComparatorProtos.java |    0
 .../hbase/protobuf/generated/EncryptionProtos.java |    0
 .../protobuf/generated/ErrorHandlingProtos.java    |    0
 .../hadoop/hbase/protobuf/generated/FSProtos.java  |    0
 .../hbase/protobuf/generated/FilterProtos.java     |    0
 .../hbase/protobuf/generated/HBaseProtos.java      |    0
 .../hbase/protobuf/generated/HFileProtos.java      |    0
 .../protobuf/generated/LoadBalancerProtos.java     |    0
 .../hbase/protobuf/generated/MapReduceProtos.java  |    0
 .../hbase/protobuf/generated/MasterProtos.java     |    0
 .../protobuf/generated/MultiRowMutationProtos.java |    0
 .../hadoop/hbase/protobuf/generated/RPCProtos.java |    0
 .../generated/RegionServerStatusProtos.java        |    0
 .../protobuf/generated/RowProcessorProtos.java     |    0
 .../protobuf/generated/SecureBulkLoadProtos.java   |    0
 .../hbase/protobuf/generated/TracingProtos.java    |    0
 .../protobuf/generated/VisibilityLabelsProtos.java |    0
 .../hadoop/hbase/protobuf/generated/WALProtos.java |    0
 .../hbase/protobuf/generated/ZooKeeperProtos.java  |    0
 .../src/main/protobuf/AccessControl.proto          |    0
 .../src/main/protobuf/Admin.proto                  |    0
 .../src/main/protobuf/Aggregate.proto              |    0
 .../src/main/protobuf/Authentication.proto         |    0
 .../src/main/protobuf/Cell.proto                   |    0
 .../src/main/protobuf/Client.proto                 |    0
 .../src/main/protobuf/ClusterId.proto              |    0
 .../src/main/protobuf/ClusterStatus.proto          |    0
 .../src/main/protobuf/Comparator.proto             |    0
 .../src/main/protobuf/Encryption.proto             |    0
 .../src/main/protobuf/ErrorHandling.proto          |    0
 .../src/main/protobuf/FS.proto                     |    0
 .../src/main/protobuf/Filter.proto                 |    0
 .../src/main/protobuf/HBase.proto                  |    0
 .../src/main/protobuf/HFile.proto                  |    0
 .../src/main/protobuf/LoadBalancer.proto           |    0
 .../src/main/protobuf/MapReduce.proto              |    0
 .../src/main/protobuf/Master.proto                 |    0
 .../src/main/protobuf/MultiRowMutation.proto       |    0
 .../src/main/protobuf/RPC.proto                    |    0
 .../src/main/protobuf/RegionServerStatus.proto     |    0
 .../src/main/protobuf/RowProcessor.proto           |    0
 .../src/main/protobuf/SecureBulkLoad.proto         |    0
 .../src/main/protobuf/Tracing.proto                |    0
 .../src/main/protobuf/VisibilityLabels.proto       |    0
 .../src/main/protobuf/WAL.proto                    |    0
 .../src/main/protobuf/ZooKeeper.proto              |    0
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache10   |   29 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache11   |   31 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache12   |   31 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54      |   30 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55      |   30 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57      |  113 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp        |   29 +
 .../hbase-trx/{pom.xml.hdp => pom.xml.hdp263}      |   44 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1     |   14 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.sscc       |   15 +
 core/sqf/src/seatrans/hbase-trx/pp.awk             |   21 +
 core/sqf/src/seatrans/hbase-trx/reinstate_orig     |    2 +-
 .../hbase/client/PatchClientScanner.java.tmpl      |    5 +-
 .../transactional/SplitBalanceHelper.java          |  142 +-
 ...nceHelper.java => SplitBalanceHelper.java.tmpl} |  142 +-
 .../transactional/SsccRegionEndpoint.java.tmpl     |   36 +-
 .../transactional/TrxRegionEndpoint.java.tmpl      |   28 +-
 .../transactional/TrxRegionObserver.java.tmpl      |   47 +-
 .../transactional/generated/SsccRegionProtos.java  |    1 -
 ...egionProtos.java => SsccRegionProtos.java.nopb} |    1 -
 ...cRegionProtos.java => SsccRegionProtos.java.pb} | 1657 +++++++-------
 .../transactional/generated/TrxRegionProtos.java   |    1 -
 ...RegionProtos.java => TrxRegionProtos.java.nopb} |    1 -
 ...rxRegionProtos.java => TrxRegionProtos.java.pb} | 2383 ++++++++++----------
 .../transactional/KeyValueListScanner.java.tmpl    |    3 +-
 .../{SsccRegion.proto => SsccRegion_pb.proto}      |    2 +
 .../{TrxRegion.proto => TrxRegion_pb.proto}        |    2 +
 core/sqf/src/seatrans/hbase-trx/uncomment_string   |    3 +-
 88 files changed, 2842 insertions(+), 2238 deletions(-)
 create mode 100755 core/sqf/src/seatrans/hbase-trx/copy_proto
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/.settings/org.eclipse.jdt.core.prefs (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/README.txt (95%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AccessControlProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AdminProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AggregateProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/AuthenticationProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/CellProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterIdProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ComparatorProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/EncryptionProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ErrorHandlingProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FSProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/FilterProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HBaseProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/HFileProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/LoadBalancerProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MapReduceProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutationProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RegionServerStatusProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RowProcessorProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/SecureBulkLoadProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/TracingProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/VisibilityLabelsProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/WALProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/AccessControl.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Admin.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Aggregate.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Authentication.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Cell.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Client.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ClusterId.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ClusterStatus.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Comparator.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Encryption.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ErrorHandling.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/FS.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Filter.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/HBase.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/HFile.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/LoadBalancer.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/MapReduce.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Master.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/MultiRowMutation.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RPC.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RegionServerStatus.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/RowProcessor.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/SecureBulkLoad.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/Tracing.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/VisibilityLabels.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/WAL.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{hbase-protocol => hbase-protocol_pb}/src/main/protobuf/ZooKeeper.proto (100%)
 copy core/sqf/src/seatrans/hbase-trx/{pom.xml.hdp => pom.xml.hdp263} (90%)
 mode change 100755 => 100644
 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/{SplitBalanceHelper.java => SplitBalanceHelper.java.tmpl} (64%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{SsccRegionProtos.java => SsccRegionProtos.java.nopb} (99%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{SsccRegionProtos.java => SsccRegionProtos.java.pb} (95%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{TrxRegionProtos.java => TrxRegionProtos.java.nopb} (99%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/{TrxRegionProtos.java => TrxRegionProtos.java.pb} (95%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/protobuf/{SsccRegion.proto => SsccRegion_pb.proto} (99%)
 copy core/sqf/src/seatrans/hbase-trx/src/main/protobuf/{TrxRegion.proto => TrxRegion_pb.proto} (99%)


[trafodion] 01/01: Merge pull request #1792 from apache/sean_traf_2.4

Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sbroeder pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git

commit edbcda08c81e880662b65c4bc4e0b3b7767b9212
Merge: 1262fd9 53a3e45
Author: Sean Broeder <sb...@apache.org>
AuthorDate: Mon Feb 11 11:25:47 2019 -0800

    Merge pull request #1792 from apache/sean_traf_2.4
    
    Sean traf 2.4

 core/sqf/src/seatrans/hbase-trx/Makefile           |   198 +-
 core/sqf/src/seatrans/hbase-trx/copy_proto         |    35 +
 core/sqf/src/seatrans/hbase-trx/genvers            |     2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |     5 +
 .../hbase-trx/hbase-protocol_pb/README.txt         |    27 +
 .../google/protobuf/HBaseZeroCopyByteString.java   |    68 +
 .../protobuf/generated/AccessControlProtos.java    | 10559 +++++
 .../hbase/protobuf/generated/AdminProtos.java      | 21451 +++++++++
 .../hbase/protobuf/generated/AggregateProtos.java  |  2372 +
 .../protobuf/generated/AuthenticationProtos.java   |  4657 ++
 .../hbase/protobuf/generated/CellProtos.java       |  2243 +
 .../hbase/protobuf/generated/ClientProtos.java     | 30398 +++++++++++++
 .../hbase/protobuf/generated/ClusterIdProtos.java  |   627 +
 .../protobuf/generated/ClusterStatusProtos.java    | 10440 +++++
 .../hbase/protobuf/generated/ComparatorProtos.java |  4687 ++
 .../hbase/protobuf/generated/EncryptionProtos.java |   954 +
 .../protobuf/generated/ErrorHandlingProtos.java    |  2894 ++
 .../hadoop/hbase/protobuf/generated/FSProtos.java  |  1235 +
 .../hbase/protobuf/generated/FilterProtos.java     | 16267 +++++++
 .../hbase/protobuf/generated/HBaseProtos.java      | 16413 +++++++
 .../hbase/protobuf/generated/HFileProtos.java      |  2402 +
 .../protobuf/generated/LoadBalancerProtos.java     |   485 +
 .../hbase/protobuf/generated/MapReduceProtos.java  |  1522 +
 .../hbase/protobuf/generated/MasterProtos.java     | 44094 +++++++++++++++++++
 .../protobuf/generated/MultiRowMutationProtos.java |  2241 +
 .../hadoop/hbase/protobuf/generated/RPCProtos.java |  5993 +++
 .../generated/RegionServerStatusProtos.java        |  5591 +++
 .../protobuf/generated/RowProcessorProtos.java     |  1700 +
 .../protobuf/generated/SecureBulkLoadProtos.java   |  4942 +++
 .../hbase/protobuf/generated/TracingProtos.java    |   591 +
 .../protobuf/generated/VisibilityLabelsProtos.java |  5543 +++
 .../hadoop/hbase/protobuf/generated/WALProtos.java |  5244 +++
 .../hbase/protobuf/generated/ZooKeeperProtos.java  |  9520 ++++
 .../src/main/protobuf/AccessControl.proto          |   122 +
 .../src/main/protobuf/Admin.proto                  |   274 +
 .../src/main/protobuf/Aggregate.proto              |    62 +
 .../src/main/protobuf/Authentication.proto         |    81 +
 .../hbase-protocol_pb/src/main/protobuf/Cell.proto |    66 +
 .../src/main/protobuf/Client.proto                 |   399 +
 .../src/main/protobuf/ClusterId.proto              |    33 +
 .../src/main/protobuf/ClusterStatus.proto          |   175 +
 .../src/main/protobuf/Comparator.proto             |    68 +
 .../src/main/protobuf/Encryption.proto             |    32 +
 .../src/main/protobuf/ErrorHandling.proto          |    57 +
 .../hbase-protocol_pb/src/main/protobuf/FS.proto   |    44 +
 .../src/main/protobuf/Filter.proto                 |   158 +
 .../src/main/protobuf/HBase.proto                  |   207 +
 .../src/main/protobuf/HFile.proto                  |    46 +
 .../src/main/protobuf/LoadBalancer.proto           |    28 +
 .../src/main/protobuf/MapReduce.proto              |    35 +
 .../src/main/protobuf/Master.proto                 |   550 +
 .../src/main/protobuf/MultiRowMutation.proto       |    43 +
 .../hbase-protocol_pb/src/main/protobuf/RPC.proto  |   133 +
 .../src/main/protobuf/RegionServerStatus.proto     |   102 +
 .../src/main/protobuf/RowProcessor.proto           |    43 +
 .../src/main/protobuf/SecureBulkLoad.proto         |    71 +
 .../src/main/protobuf/Tracing.proto                |    31 +
 .../src/main/protobuf/VisibilityLabels.proto       |    72 +
 .../hbase-protocol_pb/src/main/protobuf/WAL.proto  |   101 +
 .../src/main/protobuf/ZooKeeper.proto              |   170 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache10   |    29 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache11   |    31 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache12   |    31 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54      |    30 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55      |    30 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57      |   113 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp        |    29 +
 .../hbase-trx/{pom.xml.hdp => pom.xml.hdp263}      |    44 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1     |    14 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.sscc       |    15 +
 core/sqf/src/seatrans/hbase-trx/pp.awk             |    21 +
 core/sqf/src/seatrans/hbase-trx/reinstate_orig     |     2 +-
 .../hbase/client/PatchClientScanner.java.tmpl      |     5 +-
 .../transactional/SplitBalanceHelper.java          |   142 +-
 ...nceHelper.java => SplitBalanceHelper.java.tmpl} |   142 +-
 .../transactional/SsccRegionEndpoint.java.tmpl     |    36 +-
 .../transactional/TrxRegionEndpoint.java.tmpl      |    28 +-
 .../transactional/TrxRegionObserver.java.tmpl      |    47 +-
 .../transactional/generated/SsccRegionProtos.java  |     1 -
 ...egionProtos.java => SsccRegionProtos.java.nopb} |     1 -
 ...cRegionProtos.java => SsccRegionProtos.java.pb} |  1657 +-
 .../transactional/generated/TrxRegionProtos.java   |     1 -
 ...RegionProtos.java => TrxRegionProtos.java.nopb} |     1 -
 ...rxRegionProtos.java => TrxRegionProtos.java.pb} |  2383 +-
 .../transactional/KeyValueListScanner.java.tmpl    |     3 +-
 .../src/main/protobuf/SsccRegion_pb.proto          |   406 +
 .../hbase-trx/src/main/protobuf/TrxRegion_pb.proto |   561 +
 core/sqf/src/seatrans/hbase-trx/uncomment_string   |     3 +-
 88 files changed, 222172 insertions(+), 2237 deletions(-)