From 3fdae115a2c50560c13d14beb5ca81a4add10a07 Mon Sep 17 00:00:00 2001 From: David Hall Date: Fri, 21 Apr 2017 10:18:06 -0500 Subject: [PATCH] MCOL-597 Update README and README.md to avoid merge conflict --- README | 2 +- README.md | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README b/README index ac59b3816..9ebf34303 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ This is MariaDB ColumnStore 1.0.6 MariaDB ColumnStore 1.0.6 is the development version of MariaDB ColumnStore. -It is built by porting InfiniDB 4.6.2 on MariaDB 10.1.19 and adding entirely +It is built by porting InfiniDB 4.6.7 on MariaDB 10.1.19 and adding entirely new features not found anywhere else. MariaDB ColumnStore 1.0.6 is an GA release. This is the first MariaDB diff --git a/README.md b/README.md index 5df193e89..577ac33c1 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,16 @@ -#MariaDB ColumnStore Storage/Execution engine 1.0.1 -MariaDB ColumnStore 1.0.2 is the development version of MariaDB ColumnStore. -It is built by porting InfiniDB 4.6.2 on MariaDB 10.1.14 and adding entirely +#MariaDB ColumnStore Storage/Execution engine 1.1.0 +MariaDB ColumnStore 1.1.0 is the development version of MariaDB ColumnStore. +It is built by porting InfiniDB 4.6.7 on MariaDB 10.1.21 and adding entirely new features not found anywhere else. -#MariaDB ColumnStore 1.0.2 is an Alpha release. -This is the first MariaDB ColumnStore release, not all features planned for the MariaDB ColumnStore 1.0 -series are included in this release. +#MariaDB ColumnStore 1.1.0 is an development release. -Additional features will be pushed in future releases. -A few things to notice: -- Do not use alpha releases on production systems. +- Do not use development releases on production systems. #Building This repository is not meant to be built independently outside of the server. This repository is integrated into http://mariadb-corporation/mariadb-columnstore-server (ie, the *server*) as a git submodule. As such, you can find complete build instructions on *the server* page. https://github.com/mariadb-corporation/mariadb-columnstore-server +#Issue tracking +Issue tracking of MariaDB ColumnStore happens in JIRA, https://jira.mariadb.org/browse/MCOL