accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Tue, 28 Jan 2014 23:15:52 GMT
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3f92e0129628ab80ac979c0258278b31dd40dae6
Parents: 550d8ac 16e095f
Author: John Vines <vines@apache.org>
Authored: Tue Jan 28 18:15:42 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Tue Jan 28 18:15:42 2014 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/tserver/TabletServer.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



Mime
View raw message