You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/06/03 02:21:13 UTC
[14/19] accumulo git commit: Merge branch '1.7' into 1.8
Merge branch '1.7' into 1.8
This merges the change for ACCUMULO-4322, but not for ACCUMULO-4321,
which would revert ACCUMULO-3804.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a749ddb1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a749ddb1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a749ddb1
Branch: refs/heads/1.8
Commit: a749ddb17233606b000a01d0a5e928a24b993dc5
Parents: 24465d6 0eab0ec
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 2 19:56:28 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 2 19:56:28 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a749ddb1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f783731,20484ce..1093dba
--- a/pom.xml
+++ b/pom.xml
@@@ -116,15 -115,11 +116,15 @@@
<url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
</ciManagement>
<properties>
+ <!-- Interface used to separate tests with JUnit category -->
+ <accumulo.performanceTests>org.apache.accumulo.test.PerformanceTest</accumulo.performanceTests>
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
- <assembly.tarLongFileMode>gnu</assembly.tarLongFileMode>
+ <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<!-- bouncycastle version for test dependencies -->
<bouncycastle.version>1.50</bouncycastle.version>
+ <!-- Curator version -->
+ <curator.version>2.7.1</curator.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
<eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- extra release args for testing -->