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 2014/12/15 17:44:24 UTC

[3/8] accumulo git commit: Merge branch '1.6'

Merge branch '1.6'

Conflicts:
	examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java


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

Branch: refs/heads/master
Commit: 3356e0b34dba7f756574ba3662fedac253951e4e
Parents: 923accb 0abfa27
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:24:21 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:24:21 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/ExamplesIT.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3356e0b3/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------