Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72f2c954 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72f2c954 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72f2c954 Branch: refs/heads/master Commit: 72f2c954e044fbf6982c9fb12d02e0aaeaab24be Parents: 8218b7a 0010b94 Author: John Vines <vi...@apache.org> Authored: Fri Mar 21 15:24:10 2014 -0400 Committer: John Vines <vi...@apache.org> Committed: Fri Mar 21 15:24:10 2014 -0400 ---------------------------------------------------------------------- assemble/src/main/assemblies/component.xml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
