accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [29/29] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Tue, 04 Feb 2014 22:58:44 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	server/extras/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/76770082
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/76770082
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/76770082

Branch: refs/heads/master
Commit: 76770082752beef5f58db69aa856c79427a214a8
Parents: 47cdb92 a72dd78
Author: Josh Elser <elserj@apache.org>
Authored: Tue Feb 4 17:57:49 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Feb 4 17:57:49 2014 -0500

----------------------------------------------------------------------
 assemble/pom.xml                                |    14 +-
 .../accumulo/core/client/ClientConstants.java   |    22 +
 .../accumulo/core/client/impl/Namespaces.java   |     3 +-
 core/src/main/scripts/generate-thrift.sh        |   121 +-
 pom.xml                                         |    14 +-
 proxy/pom.xml                                   |     8 +-
 proxy/src/main/cpp/AccumuloProxy.cpp            | 28347 +++++++++++++++++
 proxy/src/main/cpp/AccumuloProxy.h              | 12479 ++++++++
 .../main/cpp/AccumuloProxy_server.skeleton.cpp  |   440 +
 proxy/src/main/cpp/proxy_constants.cpp          |    33 +
 proxy/src/main/cpp/proxy_constants.h            |    40 +
 proxy/src/main/cpp/proxy_types.cpp              |  3062 ++
 proxy/src/main/cpp/proxy_types.h                |  1869 ++
 proxy/src/main/python/AccumuloProxy-remote      |   634 +
 proxy/src/main/python/AccumuloProxy.py          | 18000 +++++++++++
 proxy/src/main/python/__init__.py               |    15 +
 proxy/src/main/python/constants.py              |    25 +
 proxy/src/main/python/ttypes.py                 |  2795 ++
 proxy/src/main/ruby/accumulo_proxy.rb           |  5429 ++++
 proxy/src/main/ruby/proxy_constants.rb          |    25 +
 proxy/src/main/ruby/proxy_types.rb              |   740 +
 proxy/src/main/scripts/generate-thrift.sh       |     1 +
 server/extras/pom.xml                           |   106 -
 .../apache/accumulo/utils/NamespaceRename.java  |   211 -
 .../accumulo/utils/metanalysis/FilterMeta.java  |    93 -
 .../accumulo/utils/metanalysis/FindTablet.java  |    66 -
 .../accumulo/utils/metanalysis/IndexMeta.java   |   183 -
 .../utils/metanalysis/LogFileInputFormat.java   |   116 -
 .../utils/metanalysis/LogFileOutputFormat.java  |    66 -
 .../accumulo/utils/metanalysis/PrintEvents.java |    99 -
 .../utils/metanalysis/package-info.java         |    34 -
 .../accumulo/test/functional/ClassLoaderIT.java |     2 +-
 32 files changed, 74059 insertions(+), 1033 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/76770082/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/76770082/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/76770082/proxy/pom.xml
----------------------------------------------------------------------


Mime
View raw message