accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [5/5] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Fri, 04 Apr 2014 18:39:42 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/standalone/accumulo-env.sh
	conf/examples/3GB/native-standalone/accumulo-env.sh
	conf/examples/3GB/standalone/accumulo-env.sh
	conf/examples/512MB/native-standalone/accumulo-env.sh
	conf/examples/512MB/standalone/accumulo-env.sh


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

Branch: refs/heads/master
Commit: 35d3919042c6d7b37f84c11f4bed25da083ec4b6
Parents: e176aa6 d137a4f
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Apr 4 14:36:44 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Apr 4 14:36:44 2014 -0400

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml      |   7 +-
 bin/bootstrap_config.sh                         | 294 +++++++++++++++++--
 conf/accumulo.policy.example                    | 143 ---------
 .../1GB/native-standalone/accumulo-env.sh       |  66 -----
 .../1GB/native-standalone/accumulo-metrics.xml  |  60 ----
 .../1GB/native-standalone/accumulo-site.xml     | 122 --------
 .../examples/1GB/native-standalone/auditLog.xml |  41 ---
 conf/examples/1GB/native-standalone/gc          |  16 -
 .../1GB/native-standalone/generic_logger.xml    |  83 ------
 .../1GB/native-standalone/log4j.properties      |  41 ---
 conf/examples/1GB/native-standalone/masters     |  16 -
 conf/examples/1GB/native-standalone/monitor     |  16 -
 .../1GB/native-standalone/monitor_logger.xml    |  64 ----
 conf/examples/1GB/native-standalone/slaves      |  16 -
 conf/examples/1GB/native-standalone/tracers     |  16 -
 conf/examples/1GB/standalone/accumulo-env.sh    |  66 -----
 .../1GB/standalone/accumulo-metrics.xml         |  60 ----
 conf/examples/1GB/standalone/accumulo-site.xml  | 122 --------
 conf/examples/1GB/standalone/auditLog.xml       |  41 ---
 conf/examples/1GB/standalone/gc                 |  16 -
 conf/examples/1GB/standalone/generic_logger.xml |  83 ------
 conf/examples/1GB/standalone/log4j.properties   |  41 ---
 conf/examples/1GB/standalone/masters            |  16 -
 conf/examples/1GB/standalone/monitor            |  16 -
 conf/examples/1GB/standalone/monitor_logger.xml |  64 ----
 conf/examples/1GB/standalone/slaves             |  16 -
 conf/examples/1GB/standalone/tracers            |  16 -
 .../2GB/native-standalone/accumulo-env.sh       |  65 ----
 .../2GB/native-standalone/accumulo-metrics.xml  |  60 ----
 .../2GB/native-standalone/accumulo-site.xml     | 112 -------
 .../examples/2GB/native-standalone/auditLog.xml |  41 ---
 conf/examples/2GB/native-standalone/gc          |  16 -
 .../2GB/native-standalone/generic_logger.xml    |  83 ------
 .../2GB/native-standalone/log4j.properties      |  41 ---
 conf/examples/2GB/native-standalone/masters     |  16 -
 conf/examples/2GB/native-standalone/monitor     |  16 -
 .../2GB/native-standalone/monitor_logger.xml    |  64 ----
 conf/examples/2GB/native-standalone/slaves      |  16 -
 conf/examples/2GB/native-standalone/tracers     |  16 -
 conf/examples/2GB/standalone/accumulo-env.sh    |  66 -----
 .../2GB/standalone/accumulo-metrics.xml         |  60 ----
 conf/examples/2GB/standalone/accumulo-site.xml  | 125 --------
 conf/examples/2GB/standalone/auditLog.xml       |  41 ---
 conf/examples/2GB/standalone/gc                 |  16 -
 conf/examples/2GB/standalone/generic_logger.xml |  83 ------
 conf/examples/2GB/standalone/log4j.properties   |  41 ---
 conf/examples/2GB/standalone/masters            |  16 -
 conf/examples/2GB/standalone/monitor            |  16 -
 conf/examples/2GB/standalone/monitor_logger.xml |  64 ----
 conf/examples/2GB/standalone/slaves             |  16 -
 conf/examples/2GB/standalone/tracers            |  16 -
 .../3GB/native-standalone/accumulo-env.sh       |  65 ----
 .../3GB/native-standalone/accumulo-metrics.xml  |  60 ----
 .../3GB/native-standalone/accumulo-site.xml     | 107 -------
 .../examples/3GB/native-standalone/auditLog.xml |  41 ---
 conf/examples/3GB/native-standalone/gc          |  16 -
 .../3GB/native-standalone/generic_logger.xml    |  83 ------
 .../3GB/native-standalone/log4j.properties      |  41 ---
 conf/examples/3GB/native-standalone/masters     |  16 -
 conf/examples/3GB/native-standalone/monitor     |  16 -
 .../3GB/native-standalone/monitor_logger.xml    |  64 ----
 conf/examples/3GB/native-standalone/slaves      |  16 -
 conf/examples/3GB/native-standalone/tracers     |  16 -
 conf/examples/3GB/standalone/accumulo-env.sh    |  65 ----
 .../3GB/standalone/accumulo-metrics.xml         |  60 ----
 conf/examples/3GB/standalone/accumulo-site.xml  | 112 -------
 conf/examples/3GB/standalone/auditLog.xml       |  41 ---
 conf/examples/3GB/standalone/gc                 |  16 -
 conf/examples/3GB/standalone/generic_logger.xml |  83 ------
 conf/examples/3GB/standalone/log4j.properties   |  41 ---
 conf/examples/3GB/standalone/masters            |  16 -
 conf/examples/3GB/standalone/monitor            |  16 -
 conf/examples/3GB/standalone/monitor_logger.xml |  64 ----
 conf/examples/3GB/standalone/slaves             |  16 -
 conf/examples/3GB/standalone/tracers            |  16 -
 .../512MB/native-standalone/accumulo-env.sh     |  65 ----
 .../native-standalone/accumulo-metrics.xml      |  60 ----
 .../512MB/native-standalone/accumulo-site.xml   | 117 --------
 .../512MB/native-standalone/auditLog.xml        |  41 ---
 conf/examples/512MB/native-standalone/gc        |  16 -
 .../512MB/native-standalone/generic_logger.xml  |  83 ------
 .../512MB/native-standalone/log4j.properties    |  41 ---
 conf/examples/512MB/native-standalone/masters   |  16 -
 conf/examples/512MB/native-standalone/monitor   |  16 -
 .../512MB/native-standalone/monitor_logger.xml  |  64 ----
 conf/examples/512MB/native-standalone/slaves    |  16 -
 conf/examples/512MB/native-standalone/tracers   |  16 -
 conf/examples/512MB/standalone/accumulo-env.sh  |  65 ----
 .../512MB/standalone/accumulo-metrics.xml       |  60 ----
 .../examples/512MB/standalone/accumulo-site.xml | 123 --------
 conf/examples/512MB/standalone/auditLog.xml     |  41 ---
 conf/examples/512MB/standalone/gc               |  16 -
 .../512MB/standalone/generic_logger.xml         |  83 ------
 conf/examples/512MB/standalone/log4j.properties |  41 ---
 conf/examples/512MB/standalone/masters          |  16 -
 conf/examples/512MB/standalone/monitor          |  16 -
 .../512MB/standalone/monitor_logger.xml         |  64 ----
 conf/examples/512MB/standalone/slaves           |  16 -
 conf/examples/512MB/standalone/tracers          |  16 -
 conf/examples/crypto/accumulo-site.xml          | 171 -----------
 conf/examples/crypto/readme.txt                 |   5 -
 conf/examples/vfs-classloader/accumulo-site.xml | 175 -----------
 conf/templates/accumulo-env.sh                  |  66 +++++
 conf/templates/accumulo-metrics.xml             |  60 ++++
 conf/templates/accumulo-site.xml                | 128 ++++++++
 conf/templates/accumulo.policy.example          | 143 +++++++++
 conf/templates/gc                               |  16 +
 conf/templates/generic_logger.xml               |  87 ++++++
 conf/templates/log4j.properties                 |  41 +++
 conf/templates/masters                          |  16 +
 conf/templates/monitor                          |  16 +
 conf/templates/monitor_logger.xml               |  64 ++++
 conf/templates/slaves                           |  16 +
 conf/templates/tracers                          |  16 +
 114 files changed, 937 insertions(+), 4942 deletions(-)
----------------------------------------------------------------------



Mime
View raw message