accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [06/10] accumulo git commit: Merge branch '1.6' into 1.7
Date Wed, 10 Aug 2016 20:17:41 GMT
Merge branch '1.6' into 1.7

Conflicts:
	server/native/src/main/resources/Makefile


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

Branch: refs/heads/1.7
Commit: a7b482ad83d5bdcd8c5d97535d72ba59498f10e4
Parents: 268922b fc9bd07
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Aug 10 16:08:44 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Aug 10 16:08:44 2016 -0400

----------------------------------------------------------------------
 server/native/src/main/resources/Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



Mime
View raw message