accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '2.0'
Date Fri, 07 Jun 2019 16:45:18 GMT
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 <ctubbsii@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(-)


Mime
View raw message