You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2019/06/07 16:45:17 UTC

[accumulo] branch master updated (2de0d4f -> 1194ac9)

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

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


    from 2de0d4f  Merge branch '2.0'
     add df55b1a  Remove accumulo-proxy from main accumulo build (#1182)
     new 1194ac9  Merge branch '2.0'

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:
 assemble/conf/accumulo-env.sh                      |      2 +-
 assemble/pom.xml                                   |      5 -
 assemble/src/main/assemblies/component.xml         |     30 -
 pom.xml                                            |      6 -
 proxy/.gitignore                                   |     31 -
 proxy/pom.xml                                      |    120 -
 proxy/proxy.properties                             |     22 -
 proxy/src/main/cpp/AccumuloProxy.cpp               |  48566 -------
 proxy/src/main/cpp/AccumuloProxy.h                 |  15433 --
 .../src/main/cpp/AccumuloProxy_server.skeleton.cpp |    553 -
 proxy/src/main/cpp/proxy_constants.cpp             |     33 -
 proxy/src/main/cpp/proxy_constants.h               |     40 -
 proxy/src/main/cpp/proxy_types.cpp                 |   5074 -
 proxy/src/main/cpp/proxy_types.h                   |   2031 -
 .../main/java/org/apache/accumulo/proxy/Proxy.java |    283 -
 .../org/apache/accumulo/proxy/ProxyServer.java     |   2244 -
 .../main/java/org/apache/accumulo/proxy/Util.java  |     70 -
 .../accumulo/proxy/thrift/AccumuloException.java   |    393 -
 .../accumulo/proxy/thrift/AccumuloProxy.java       | 133906 ------------------
 .../proxy/thrift/AccumuloSecurityException.java    |    393 -
 .../accumulo/proxy/thrift/ActiveCompaction.java    |   1457 -
 .../apache/accumulo/proxy/thrift/ActiveScan.java   |   1626 -
 .../accumulo/proxy/thrift/BatchScanOptions.java    |   1030 -
 .../org/apache/accumulo/proxy/thrift/Column.java   |    642 -
 .../apache/accumulo/proxy/thrift/ColumnUpdate.java |    967 -
 .../accumulo/proxy/thrift/CompactionReason.java    |     67 -
 .../proxy/thrift/CompactionStrategyConfig.java     |    550 -
 .../accumulo/proxy/thrift/CompactionType.java      |     64 -
 .../apache/accumulo/proxy/thrift/Condition.java    |    784 -
 .../accumulo/proxy/thrift/ConditionalStatus.java   |     67 -
 .../accumulo/proxy/thrift/ConditionalUpdates.java  |    608 -
 .../proxy/thrift/ConditionalWriterOptions.java     |    865 -
 .../apache/accumulo/proxy/thrift/DiskUsage.java    |    543 -
 .../apache/accumulo/proxy/thrift/Durability.java   |     67 -
 .../accumulo/proxy/thrift/IteratorScope.java       |     61 -
 .../accumulo/proxy/thrift/IteratorSetting.java     |    755 -
 .../java/org/apache/accumulo/proxy/thrift/Key.java |    866 -
 .../apache/accumulo/proxy/thrift/KeyExtent.java    |    629 -
 .../org/apache/accumulo/proxy/thrift/KeyValue.java |    516 -
 .../accumulo/proxy/thrift/KeyValueAndPeek.java     |    498 -
 .../proxy/thrift/MutationsRejectedException.java   |    393 -
 .../proxy/thrift/NamespaceExistsException.java     |    393 -
 .../proxy/thrift/NamespaceNotEmptyException.java   |    393 -
 .../proxy/thrift/NamespaceNotFoundException.java   |    393 -
 .../accumulo/proxy/thrift/NamespacePermission.java |     79 -
 .../proxy/thrift/NoMoreEntriesException.java       |    393 -
 .../apache/accumulo/proxy/thrift/PartialKey.java   |     70 -
 .../org/apache/accumulo/proxy/thrift/Range.java    |    704 -
 .../apache/accumulo/proxy/thrift/ScanColumn.java   |    527 -
 .../apache/accumulo/proxy/thrift/ScanOptions.java  |    980 -
 .../apache/accumulo/proxy/thrift/ScanResult.java   |    548 -
 .../apache/accumulo/proxy/thrift/ScanState.java    |     61 -
 .../org/apache/accumulo/proxy/thrift/ScanType.java |     58 -
 .../accumulo/proxy/thrift/SystemPermission.java    |     88 -
 .../proxy/thrift/TableExistsException.java         |    393 -
 .../proxy/thrift/TableNotFoundException.java       |    393 -
 .../accumulo/proxy/thrift/TablePermission.java     |     70 -
 .../org/apache/accumulo/proxy/thrift/TimeType.java |     58 -
 .../accumulo/proxy/thrift/UnknownScanner.java      |    393 -
 .../accumulo/proxy/thrift/UnknownWriter.java       |    393 -
 .../accumulo/proxy/thrift/WriterOptions.java       |    800 -
 proxy/src/main/python/AccumuloProxy-remote         |    824 -
 proxy/src/main/python/AccumuloProxy.py             |  25443 ----
 proxy/src/main/python/__init__.py                  |     15 -
 proxy/src/main/python/constants.py                 |     28 -
 proxy/src/main/python/ttypes.py                    |   3234 -
 proxy/src/main/ruby/accumulo_proxy.rb              |   7069 -
 proxy/src/main/ruby/proxy_constants.rb             |     25 -
 proxy/src/main/ruby/proxy_types.rb                 |    927 -
 proxy/src/main/scripts/generate-thrift.sh          |     25 -
 proxy/src/main/spotbugs/exclude-filter.xml         |     26 -
 proxy/src/main/thrift/proxy.thrift                 |   1253 -
 .../org/apache/accumulo/proxy/ProxyServerTest.java |    112 -
 proxy/src/test/resources/log4j.properties          |     26 -
 test/pom.xml                                       |      4 -
 .../accumulo/test/functional/KerberosProxyIT.java  |    634 -
 .../accumulo/test/proxy/ProxyDurabilityIT.java     |    154 -
 .../accumulo/test/proxy/SimpleProxyBase.java       |   2861 -
 .../apache/accumulo/test/proxy/TBinaryProxyIT.java |     32 -
 .../accumulo/test/proxy/TCompactProxyIT.java       |     35 -
 .../accumulo/test/proxy/TJsonProtocolProxyIT.java  |     32 -
 .../apache/accumulo/test/proxy/TTupleProxyIT.java  |     32 -
 .../accumulo/test/proxy/TestProxyClient.java       |    210 -
 .../apache/accumulo/test/start/KeywordStartIT.java |      3 -
 84 files changed, 1 insertion(+), 272480 deletions(-)
 delete mode 100644 proxy/.gitignore
 delete mode 100644 proxy/pom.xml
 delete mode 100644 proxy/proxy.properties
 delete mode 100644 proxy/src/main/cpp/AccumuloProxy.cpp
 delete mode 100644 proxy/src/main/cpp/AccumuloProxy.h
 delete mode 100644 proxy/src/main/cpp/AccumuloProxy_server.skeleton.cpp
 delete mode 100644 proxy/src/main/cpp/proxy_constants.cpp
 delete mode 100644 proxy/src/main/cpp/proxy_constants.h
 delete mode 100644 proxy/src/main/cpp/proxy_types.cpp
 delete mode 100644 proxy/src/main/cpp/proxy_types.h
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/Util.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
 delete mode 100644 proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
 delete mode 100644 proxy/src/main/python/AccumuloProxy-remote
 delete mode 100644 proxy/src/main/python/AccumuloProxy.py
 delete mode 100644 proxy/src/main/python/__init__.py
 delete mode 100644 proxy/src/main/python/constants.py
 delete mode 100644 proxy/src/main/python/ttypes.py
 delete mode 100644 proxy/src/main/ruby/accumulo_proxy.rb
 delete mode 100644 proxy/src/main/ruby/proxy_constants.rb
 delete mode 100644 proxy/src/main/ruby/proxy_types.rb
 delete mode 100755 proxy/src/main/scripts/generate-thrift.sh
 delete mode 100644 proxy/src/main/spotbugs/exclude-filter.xml
 delete mode 100644 proxy/src/main/thrift/proxy.thrift
 delete mode 100644 proxy/src/test/java/org/apache/accumulo/proxy/ProxyServerTest.java
 delete mode 100644 proxy/src/test/resources/log4j.properties
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/functional/KerberosProxyIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
 delete mode 100644 test/src/main/java/org/apache/accumulo/test/proxy/TestProxyClient.java


[accumulo] 01/01: Merge branch '2.0'

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

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

commit 1194ac970c299d913dc76241e6a58e34e5c1de08
Merge: 2de0d4f df55b1a
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Jun 7 12:45:00 2019 -0400

    Merge branch '2.0'

 assemble/conf/accumulo-env.sh                      |      2 +-
 assemble/pom.xml                                   |      5 -
 assemble/src/main/assemblies/component.xml         |     30 -
 pom.xml                                            |      6 -
 proxy/.gitignore                                   |     31 -
 proxy/pom.xml                                      |    120 -
 proxy/proxy.properties                             |     22 -
 proxy/src/main/cpp/AccumuloProxy.cpp               |  48566 -------
 proxy/src/main/cpp/AccumuloProxy.h                 |  15433 --
 .../src/main/cpp/AccumuloProxy_server.skeleton.cpp |    553 -
 proxy/src/main/cpp/proxy_constants.cpp             |     33 -
 proxy/src/main/cpp/proxy_constants.h               |     40 -
 proxy/src/main/cpp/proxy_types.cpp                 |   5074 -
 proxy/src/main/cpp/proxy_types.h                   |   2031 -
 .../main/java/org/apache/accumulo/proxy/Proxy.java |    283 -
 .../org/apache/accumulo/proxy/ProxyServer.java     |   2244 -
 .../main/java/org/apache/accumulo/proxy/Util.java  |     70 -
 .../accumulo/proxy/thrift/AccumuloException.java   |    393 -
 .../accumulo/proxy/thrift/AccumuloProxy.java       | 133906 ------------------
 .../proxy/thrift/AccumuloSecurityException.java    |    393 -
 .../accumulo/proxy/thrift/ActiveCompaction.java    |   1457 -
 .../apache/accumulo/proxy/thrift/ActiveScan.java   |   1626 -
 .../accumulo/proxy/thrift/BatchScanOptions.java    |   1030 -
 .../org/apache/accumulo/proxy/thrift/Column.java   |    642 -
 .../apache/accumulo/proxy/thrift/ColumnUpdate.java |    967 -
 .../accumulo/proxy/thrift/CompactionReason.java    |     67 -
 .../proxy/thrift/CompactionStrategyConfig.java     |    550 -
 .../accumulo/proxy/thrift/CompactionType.java      |     64 -
 .../apache/accumulo/proxy/thrift/Condition.java    |    784 -
 .../accumulo/proxy/thrift/ConditionalStatus.java   |     67 -
 .../accumulo/proxy/thrift/ConditionalUpdates.java  |    608 -
 .../proxy/thrift/ConditionalWriterOptions.java     |    865 -
 .../apache/accumulo/proxy/thrift/DiskUsage.java    |    543 -
 .../apache/accumulo/proxy/thrift/Durability.java   |     67 -
 .../accumulo/proxy/thrift/IteratorScope.java       |     61 -
 .../accumulo/proxy/thrift/IteratorSetting.java     |    755 -
 .../java/org/apache/accumulo/proxy/thrift/Key.java |    866 -
 .../apache/accumulo/proxy/thrift/KeyExtent.java    |    629 -
 .../org/apache/accumulo/proxy/thrift/KeyValue.java |    516 -
 .../accumulo/proxy/thrift/KeyValueAndPeek.java     |    498 -
 .../proxy/thrift/MutationsRejectedException.java   |    393 -
 .../proxy/thrift/NamespaceExistsException.java     |    393 -
 .../proxy/thrift/NamespaceNotEmptyException.java   |    393 -
 .../proxy/thrift/NamespaceNotFoundException.java   |    393 -
 .../accumulo/proxy/thrift/NamespacePermission.java |     79 -
 .../proxy/thrift/NoMoreEntriesException.java       |    393 -
 .../apache/accumulo/proxy/thrift/PartialKey.java   |     70 -
 .../org/apache/accumulo/proxy/thrift/Range.java    |    704 -
 .../apache/accumulo/proxy/thrift/ScanColumn.java   |    527 -
 .../apache/accumulo/proxy/thrift/ScanOptions.java  |    980 -
 .../apache/accumulo/proxy/thrift/ScanResult.java   |    548 -
 .../apache/accumulo/proxy/thrift/ScanState.java    |     61 -
 .../org/apache/accumulo/proxy/thrift/ScanType.java |     58 -
 .../accumulo/proxy/thrift/SystemPermission.java    |     88 -
 .../proxy/thrift/TableExistsException.java         |    393 -
 .../proxy/thrift/TableNotFoundException.java       |    393 -
 .../accumulo/proxy/thrift/TablePermission.java     |     70 -
 .../org/apache/accumulo/proxy/thrift/TimeType.java |     58 -
 .../accumulo/proxy/thrift/UnknownScanner.java      |    393 -
 .../accumulo/proxy/thrift/UnknownWriter.java       |    393 -
 .../accumulo/proxy/thrift/WriterOptions.java       |    800 -
 proxy/src/main/python/AccumuloProxy-remote         |    824 -
 proxy/src/main/python/AccumuloProxy.py             |  25443 ----
 proxy/src/main/python/__init__.py                  |     15 -
 proxy/src/main/python/constants.py                 |     28 -
 proxy/src/main/python/ttypes.py                    |   3234 -
 proxy/src/main/ruby/accumulo_proxy.rb              |   7069 -
 proxy/src/main/ruby/proxy_constants.rb             |     25 -
 proxy/src/main/ruby/proxy_types.rb                 |    927 -
 proxy/src/main/scripts/generate-thrift.sh          |     25 -
 proxy/src/main/spotbugs/exclude-filter.xml         |     26 -
 proxy/src/main/thrift/proxy.thrift                 |   1253 -
 .../org/apache/accumulo/proxy/ProxyServerTest.java |    112 -
 proxy/src/test/resources/log4j.properties          |     26 -
 test/pom.xml                                       |      4 -
 .../accumulo/test/functional/KerberosProxyIT.java  |    634 -
 .../accumulo/test/proxy/ProxyDurabilityIT.java     |    154 -
 .../accumulo/test/proxy/SimpleProxyBase.java       |   2861 -
 .../apache/accumulo/test/proxy/TBinaryProxyIT.java |     32 -
 .../accumulo/test/proxy/TCompactProxyIT.java       |     35 -
 .../accumulo/test/proxy/TJsonProtocolProxyIT.java  |     32 -
 .../apache/accumulo/test/proxy/TTupleProxyIT.java  |     32 -
 .../accumulo/test/proxy/TestProxyClient.java       |    210 -
 .../apache/accumulo/test/start/KeywordStartIT.java |      3 -
 84 files changed, 1 insertion(+), 272480 deletions(-)