Repository: flume
Updated Branches:
  refs/heads/trunk 2f731f0aa -> af4ea3fef


Move README.textile to README.md and add license header

The version of textile implemented by GitHub doesn't appear to support a
comment syntax.


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

Branch: refs/heads/trunk
Commit: af4ea3fef1068c96b3c96e7915ddb12a8d9f94d9
Parents: 2f731f0
Author: Mike Percy <[email protected]>
Authored: Mon Jun 27 02:14:40 2016 -0700
Committer: Mike Percy <[email protected]>
Committed: Mon Jun 27 02:19:50 2016 -0700

----------------------------------------------------------------------
 README.md      |  69 ++++++++++++++++++++++++++++++++++++
 README.textile | 100 ----------------------------------------------------
 2 files changed, 69 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/af4ea3fe/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..790890d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,69 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Welcome to Apache Flume!
+
+Apache Flume is a distributed, reliable, and available service for efficiently
+collecting, aggregating, and moving large amounts of log data. It has a simple
+and flexible architecture based on streaming data flows. It is robust and fault
+tolerant with tunable reliability mechanisms and many failover and recovery
+mechanisms. The system is centrally managed and allows for intelligent dynamic
+management. It uses a simple extensible data model that allows for online
+analytic application.
+
+The Apache Flume 1.x (NG) code line is a refactoring of the first generation
+Flume to solve certain known issues and limitations of the original design.
+
+Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
+
+## Documentation
+
+Documentation is included in the binary distribution under the docs directory.
+In source form, it can be found in the flume-ng-doc directory.
+
+The Flume 1.x guide and FAQ are available here:
+
+* https://cwiki.apache.org/FLUME/flume-ng.html
+* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
+
+## Contact us!
+
+* Mailing lists: 
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
+* IRC channel #flume on irc.freenode.net
+
+Bug and Issue tracker.
+
+* https://issues.apache.org/jira/browse/FLUME
+
+## Compiling Flume
+
+Compiling Flume requires the following tools:
+
+* Oracle Java JDK 1.7
+* Apache Maven 3.x
+
+Note: The Apache Flume build requires more memory than the default 
configuration.
+We recommend you set the following Maven options:
+
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
+
+To compile Flume, run `mvn compile`.
+To build a distribution, run `mvn install`.
+
+The final Flume distribution artifacts will be in 
$project/flume-ng-dist/target/.

http://git-wip-us.apache.org/repos/asf/flume/blob/af4ea3fe/README.textile
----------------------------------------------------------------------
diff --git a/README.textile b/README.textile
deleted file mode 100644
index 2b884fa..0000000
--- a/README.textile
+++ /dev/null
@@ -1,100 +0,0 @@
-h1. Welcome to Apache Flume!
-
-Apache Flume is a distributed, reliable, and available service for efficiently
-collecting, aggregating, and moving large amounts of log data. It has a simple
-and flexible architecture based on streaming data flows. It is robust and fault
-tolerant with tunable reliability mechanisms and many failover and recovery
-mechanisms. The system is centrally managed and allows for intelligent dynamic
-management. It uses a simple extensible data model that allows for online
-analytic application.
-
-The Apache Flume 1.x (NG) code line is a refactoring of the first generation
-Flume to solve certain known issues and limitations of the original design.
-
-Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
-
-h2. Documentation
-
-Documentation is included in the binary distribution under the docs directory.
-In source form, it can be found in the flume-ng-doc directory.
-
-The Flume 1.x guide and FAQ are available here:
-
-* https://cwiki.apache.org/FLUME/flume-ng.html
-* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
-
-h2. Contact us!
-
-* Mailing lists: 
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
-* IRC channel #flume on irc.freenode.net
-
-Bug and Issue tracker.
-
-* https://issues.apache.org/jira/browse/FLUME
-
-h2. Compiling Flume
-
-Compiling Flume requires the following tools:
-
-* Oracle Java JDK 1.7
-* Apache Maven 3.x
-
-Note: The Apache Flume build requires more memory than the default 
configuration.
-We recommend you set the following Maven options:
-
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
-
-To compile Flume, run `mvn compile`.
-To build a distribution, run `mvn install`.
-
-The final Flume distribution artifacts will be in 
$project/flume-ng-dist/target/.
-h1. Welcome to Apache Flume!
-
-Apache Flume is a distributed, reliable, and available service for efficiently
-collecting, aggregating, and moving large amounts of log data. It has a simple
-and flexible architecture based on streaming data flows. It is robust and fault
-tolerant with tunable reliability mechanisms and many failover and recovery
-mechanisms. The system is centrally managed and allows for intelligent dynamic
-management. It uses a simple extensible data model that allows for online
-analytic application.
-
-The Apache Flume 1.x (NG) code line is a refactoring of the first generation
-Flume to solve certain known issues and limitations of the original design.
-
-Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
-
-h2. Documentation
-
-Documentation is included in the binary distribution under the docs directory.
-In source form, it can be found in the flume-ng-doc directory.
-
-The Flume 1.x guide and FAQ are available here:
-
-* https://cwiki.apache.org/FLUME/flume-ng.html
-* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
-
-h2. Contact us!
-
-* Mailing lists: 
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
-* IRC channel #flume on irc.freenode.net
-
-Bug and Issue tracker.
-
-* https://issues.apache.org/jira/browse/FLUME
-
-h2. Compiling Flume
-
-Compiling Flume requires the following tools:
-
-* Oracle Java JDK 1.7
-* Apache Maven 3.x
-
-Note: The Apache Flume build requires more memory than the default 
configuration.
-We recommend you set the following Maven options:
-
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
-
-To compile Flume, run `mvn compile`.
-To build a distribution, run `mvn install`.
-
-The final Flume distribution artifacts will be in 
$project/flume-ng-dist/target/.

Reply via email to