accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Tue, 01 Apr 2014 22:41:12 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	init/pom.xml


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

Branch: refs/heads/master
Commit: 03233d7909bd6c6c9d192bf187a6abdc39cdc704
Parents: 77bb273 a1814fc
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Apr 1 18:36:57 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Apr 1 18:36:57 2014 -0400

----------------------------------------------------------------------
 README                                          |  11 +-
 assemble/build.sh                               |  26 +-
 assemble/deb/accumulo-custom-conf/control       |  27 --
 assemble/deb/accumulo-gc/control                |  27 --
 assemble/deb/accumulo-logger/control            |  26 --
 assemble/deb/accumulo-master/control            |  26 --
 assemble/deb/accumulo-monitor/control           |  26 --
 assemble/deb/accumulo-native/control            |  26 --
 assemble/deb/accumulo-native/postinst           |  34 --
 assemble/deb/accumulo-native/postrm             |  20 -
 assemble/deb/accumulo-single-conf/control       |  27 --
 assemble/deb/accumulo-singleton/control         |  26 --
 assemble/deb/accumulo-slave/control             |  26 --
 assemble/deb/accumulo-test/control              |  26 --
 assemble/deb/accumulo-tserver/control           |  26 --
 assemble/deb/accumulo/conffile                  |  23 --
 assemble/deb/accumulo/control                   |  27 --
 assemble/deb/accumulo/postinst                  |  44 --
 assemble/deb/accumulo/postrm                    |  37 --
 assemble/pom.xml                                | 402 -------------------
 assemble/scripts/gc-only-init.sh                |  47 ---
 assemble/scripts/master-only-init.sh            |  46 ---
 assemble/scripts/monitor-only-init.sh           |  45 ---
 assemble/scripts/stand-alone-init.sh            |  26 --
 assemble/scripts/tracer-only-init.sh            |  45 ---
 assemble/scripts/tserver-only-init.sh           |  46 ---
 assemble/src/main/assemblies/component.xml      |  32 --
 bin/etc_initd_accumulo                          |  57 ---
 contrib/dotfile-rpmmacros                       |  20 -
 core/pom.xml                                    | 161 --------
 .../etc/security/limits.d/50-accumulo.conf      |  17 -
 core/src/main/packaging/etc/sysctl.d/accumulo   |  20 -
 docs/pom.xml                                    |  44 --
 docs/src/main/resources/examples/README.dirlist |   2 +-
 examples/simple/pom.xml                         |  34 --
 fate/pom.xml                                    |  33 --
 init/pom.xml                                    |  99 -----
 .../main/packaging/etc/accumulo/accumulo-env.sh |  65 ---
 .../packaging/etc/accumulo/accumulo-site.xml    |  87 ----
 .../main/packaging/etc/accumulo/auditLog.xml    |  41 --
 init/src/main/packaging/etc/accumulo/gc         |  16 -
 .../packaging/etc/accumulo/generic_logger.xml   |  83 ----
 .../packaging/etc/accumulo/log4j.properties     |  41 --
 init/src/main/packaging/etc/accumulo/masters    |  16 -
 .../packaging/etc/accumulo/monitor_logger.xml   |  64 ---
 init/src/main/packaging/etc/accumulo/monitors   |  16 -
 init/src/main/packaging/etc/accumulo/slaves     |  16 -
 init/src/main/packaging/etc/accumulo/tracers    |  15 -
 pom.xml                                         | 145 +------
 proxy/pom.xml                                   |  66 ---
 server/base/pom.xml                             |  48 ---
 server/gc/pom.xml                               |  50 ---
 .../src/main/packaging/etc/init.d/accumulo-gc   | 159 --------
 server/master/pom.xml                           |  50 ---
 .../main/packaging/etc/init.d/accumulo-master   | 160 --------
 server/monitor/pom.xml                          |  51 ---
 .../main/packaging/etc/init.d/accumulo-monitor  | 159 --------
 server/native/pom.xml                           |  63 ---
 server/tracer/pom.xml                           |  50 ---
 .../main/packaging/etc/init.d/accumulo-tracer   | 159 --------
 server/tserver/pom.xml                          |  50 ---
 .../main/packaging/etc/init.d/accumulo-tserver  | 161 --------
 start/pom.xml                                   |  33 --
 trace/pom.xml                                   |  31 --
 64 files changed, 8 insertions(+), 3574 deletions(-)
----------------------------------------------------------------------


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

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/examples/simple/pom.xml
----------------------------------------------------------------------

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

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

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/base/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/gc/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/master/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/monitor/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/native/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/tracer/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03233d79/server/tserver/pom.xml
----------------------------------------------------------------------

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

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


Mime
View raw message