Repository: flume Updated Branches: refs/heads/flume-1.9 dbf3273a0 -> 4fcf23d7e (forced update) Updated Tags: refs/tags/release-1.9.0-rc1 7a2378c1f -> e2b27b693
FLUME-3302 Fix issues discovered during the release Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/85e11525 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/85e11525 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/85e11525 Branch: refs/heads/flume-1.9 Commit: 85e115255a3940c0f7154e5bb4f089da81e8b2da Parents: 1a2c823 Author: Ferenc Szabo <[email protected]> Authored: Mon Dec 3 20:22:12 2018 +0100 Committer: Ferenc Szabo <[email protected]> Committed: Tue Dec 4 17:25:18 2018 +0100 ---------------------------------------------------------------------- build-support/pom.xml | 3 +++ flume-ng-doc/site.xml | 2 +- flume-ng-doc/sphinx/FlumeUserGuide.rst | 3 +-- flume-ng-doc/sphinx/index.rst | 2 +- pom.xml | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/85e11525/build-support/pom.xml ---------------------------------------------------------------------- diff --git a/build-support/pom.xml b/build-support/pom.xml index 18d82cc..7f70e29 100644 --- a/build-support/pom.xml +++ b/build-support/pom.xml @@ -27,5 +27,8 @@ limitations under the License. <description>Build tools and Configuration</description> <properties> <maven.site.skip>true</maven.site.skip> + <maven.deploy.skip>true</maven.deploy.skip> + <maven.jar.skip>true</maven.jar.skip> + <gpg.skip>true</gpg.skip> </properties> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/85e11525/flume-ng-doc/site.xml ---------------------------------------------------------------------- diff --git a/flume-ng-doc/site.xml b/flume-ng-doc/site.xml index 29ea2ae..d61e698 100644 --- a/flume-ng-doc/site.xml +++ b/flume-ng-doc/site.xml @@ -26,7 +26,7 @@ <version position="none"/> <poweredBy> - <logo name="Flume" href="http://incubator.apache.org/flume"; + <logo name="Flume" href="http://flume.apache.org/"; img="_static/flume-logo.png" /> </poweredBy> http://git-wip-us.apache.org/repos/asf/flume/blob/85e11525/flume-ng-doc/sphinx/FlumeUserGuide.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index 8ae80f9..c64a98d 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -2430,8 +2430,7 @@ Deprecated Properties Name Default Description ====================== ============ ====================================================================== -hdfs.callTimeout 30000 Number of milliseconds allowed for HDFS operations, such as open, write, flush, close. - This number should be increased if many HDFS timeout operations are occurring. +hdfs.callTimeout 30000 Number of milliseconds allowed for HDFS operations, such as open, write, flush, close. This number should be increased if many HDFS timeout operations are occurring. ====================== ============ ====================================================================== Example for agent named a1: http://git-wip-us.apache.org/repos/asf/flume/blob/85e11525/flume-ng-doc/sphinx/index.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/index.rst b/flume-ng-doc/sphinx/index.rst index 355f344..0fb16ae 100644 --- a/flume-ng-doc/sphinx/index.rst +++ b/flume-ng-doc/sphinx/index.rst @@ -46,7 +46,7 @@ Overview -------- - `Project information <project-info.html>`_ -- `Download Apache Flume <http://www.apache.org/dyn/closer.cgi/incubator/flume>`_ +- `Download Apache Flume <http://www.apache.org/dyn/closer.cgi/flume>`_ - `Flume Wiki <http://cwiki.apache.org/confluence/display/FLUME>`_ - `Getting Started Guide <http://cwiki.apache.org/confluence/display/FLUME/Getting+Started>`_ - `Flume Issue Tracking (JIRA) <https://issues.apache.org/jira/browse/FLUME>`_ http://git-wip-us.apache.org/repos/asf/flume/blob/85e11525/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 26343f9..7826920 100644 --- a/pom.xml +++ b/pom.xml @@ -599,6 +599,7 @@ limitations under the License. <!-- include ONLY flume multi-module dependencies --> <dependencySourceInclude>org.apache.flume:*</dependencySourceInclude> </dependencySourceIncludes> + <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin>
