[03/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-18 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java 1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[03/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-12-04 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/13759eff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13759eff Diff: http://git-wip-us.apache.org/repos/asf/