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 2015/12/16 20:35:01 UTC
[1/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default
location
Repository: accumulo
Updated Branches:
refs/heads/master c7b27e0ae -> 67560a618
ACCUMULO-4076 Leave javadocs in default location
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f02a65d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f02a65d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f02a65d
Branch: refs/heads/master
Commit: 4f02a65d54ac52f97b365d012e30dfc9dbeff1c7
Parents: ef8c1ca
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Dec 16 14:06:55 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 16 14:06:55 2015 -0500
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f02a65d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d2db6e..8b4e129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,6 @@
<configuration>
<encoding>${project.reporting.outputEncoding}</encoding>
<quiet>true</quiet>
- <reportOutputDirectory>docs</reportOutputDirectory>
<javadocVersion>${java.ver}</javadocVersion>
<additionalJOption>-J-Xmx512m</additionalJOption>
</configuration>
[2/3] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f51e6b0c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f51e6b0c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f51e6b0c
Branch: refs/heads/master
Commit: f51e6b0c2d8e643344f91ce5d4386a60e9c82324
Parents: 904e957 4f02a65
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Dec 16 14:20:25 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 16 14:20:25 2015 -0500
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f51e6b0c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 8b0c656,8b4e129..c446c19
--- a/pom.xml
+++ b/pom.xml
@@@ -642,8 -608,7 +642,7 @@@
<configuration>
<encoding>${project.reporting.outputEncoding}</encoding>
<quiet>true</quiet>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>${java.ver}</javadocVersion>
+ <javadocVersion>${maven.compiler.target}</javadocVersion>
<additionalJOption>-J-Xmx512m</additionalJOption>
</configuration>
</plugin>
[3/3] accumulo git commit: Merge branch '1.7'
Posted by ct...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67560a61
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67560a61
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67560a61
Branch: refs/heads/master
Commit: 67560a618bc9f43dca8f8e12de287ca9c40a92c5
Parents: c7b27e0 f51e6b0
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Dec 16 14:27:03 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 16 14:27:03 2015 -0500
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/67560a61/pom.xml
----------------------------------------------------------------------