Updated Branches: refs/heads/1.5.1-SNAPSHOT-1.4.4-SNAPSHOT-merged [created] f5b2efa0a
ACCUMULO-1603 Merge commit '333062d' into 1.5.1-SNAPSHOT. Merging 1.4 into 1.5, using 1.5 changes in the face of conflicts as 1.4 and 1.5 were in a correct merged state before the transition from svn to git. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b03b8649 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b03b8649 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b03b8649 Branch: refs/heads/1.5.1-SNAPSHOT-1.4.4-SNAPSHOT-merged Commit: b03b86491a74a079d0f81bb22e0811c87b8a1d40 Parents: 35c7591 333062d Author: Josh Elser <els...@apache.org> Authored: Tue Jul 23 20:21:58 2013 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jul 23 20:21:58 2013 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
