You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2013/10/18 01:47:21 UTC

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT'

Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

I had fixed this in master when resolving the merge conflict, but not in
1.5.1


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

Branch: refs/heads/master
Commit: e26fc0bff1c2558f68f096e23393d3dca1a3b80f
Parents: 5480ae0 18bcd14
Author: Josh Elser <el...@apache.org>
Authored: Thu Oct 17 19:46:51 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 17 19:46:51 2013 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------