carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [1/2] carbondata git commit: update docs
Date Thu, 11 May 2017 12:59:06 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master 35b23c9dd -> cebeeed90


update docs

update docs


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

Branch: refs/heads/master
Commit: 323ae9ebe5033536bd9d1f2a174f0d062828b82c
Parents: 35b23c9
Author: chenliang613 <chenliang613@huawei.com>
Authored: Thu May 11 20:51:19 2017 +0800
Committer: chenliang613 <chenliang613@huawei.com>
Committed: Thu May 11 20:58:04 2017 +0800

----------------------------------------------------------------------
 conf/dataload.properties.template    |  2 +-
 dev/carbon_pr.py                     |  6 +--
 docs/file-structure-of-carbondata.md |  2 +-
 docs/release-guide.md                | 63 ++-----------------------------
 4 files changed, 8 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/323ae9eb/conf/dataload.properties.template
----------------------------------------------------------------------
diff --git a/conf/dataload.properties.template b/conf/dataload.properties.template
index cab712a..0b2f6cf 100644
--- a/conf/dataload.properties.template
+++ b/conf/dataload.properties.template
@@ -18,7 +18,7 @@
 
 #carbon store path
 # you should change to the code path of your local machine
-carbon.storelocation=/home/david/Documents/incubator-carbondata/examples/spark2/target/store
+carbon.storelocation=/home/david/Documents/carbondata/examples/spark2/target/store
 
 #csv delimiter character
 delimiter=,

http://git-wip-us.apache.org/repos/asf/carbondata/blob/323ae9eb/dev/carbon_pr.py
----------------------------------------------------------------------
diff --git a/dev/carbon_pr.py b/dev/carbon_pr.py
index 271ef4e..d6dfb56 100755
--- a/dev/carbon_pr.py
+++ b/dev/carbon_pr.py
@@ -38,7 +38,7 @@ try:
 except ImportError:
     JIRA_IMPORTED = False
 
-PROJECT_NAME = "incubator-carbondata"
+PROJECT_NAME = "carbondata"
 
 CAPITALIZED_PROJECT_NAME = "carbondata".upper()
 
@@ -387,12 +387,12 @@ def assert_remotes():
     status = 0
     if "apache" not in remotes:
         print "You don't have remote 'apache' configured. Please run this command:\n" + \
-        "git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-carbondata.git\n"
+        "git remote add apache https://git-wip-us.apache.org/repos/asf/carbondata.git\n"
         status = -1
 
     if "apache-github" not in remotes:
         print "You don't have remote 'apache-github' configured. Please run this command:\n"
+ \
-        "git remote add apache-github https://github.com/apache/incubator-carbondata.git\n"
+        "git remote add apache-github https://github.com/apache/carbondata.git\n"
         status = -1
 
     if status != 0:

http://git-wip-us.apache.org/repos/asf/carbondata/blob/323ae9eb/docs/file-structure-of-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/file-structure-of-carbondata.md b/docs/file-structure-of-carbondata.md
index bfbcee4..e6be48d 100644
--- a/docs/file-structure-of-carbondata.md
+++ b/docs/file-structure-of-carbondata.md
@@ -31,7 +31,7 @@ The file footer can be read once to build the indices in memory, which can
be ut
 * File Header : It contains CarbonData file version number, list of column schema and schema
updation timestamp.
 * File Footer : it contains Number of rows, segmentinfo ,all blocklets’ info and index,
you can find the detail from the below diagram.
 * Blocklet : Rows are grouped to form a blocklet, the size of the blocklet is configurable
and default size is 64MB, Blocklet contains Column Page groups for each column.
-* Column Page Group : Data of one column and it is further divided to pages, it is guaranteed
to be contiguous in file.
+* Column Page Group : Data of one column and it is further divided into pages, it is guaranteed
to be contiguous in file.
 * Page : It has the data of one column and the number of row is fixed to 32000 size. 
 
 ![CarbonData File Format](../docs/images/carbon_data_format_new.png?raw=true)

http://git-wip-us.apache.org/repos/asf/carbondata/blob/323ae9eb/docs/release-guide.md
----------------------------------------------------------------------
diff --git a/docs/release-guide.md b/docs/release-guide.md
index 18c39c4..d33dc3e 100644
--- a/docs/release-guide.md
+++ b/docs/release-guide.md
@@ -218,7 +218,7 @@ x.x.x release".
 
 Copy the source release to dev repository on `dist.apache.org`.
 
-1. If you have not already, check out the Incubator section of the `dev` repository on `dist
+1. If you have not already, check out the section of the `dev` repository on `dist
 .apache.org` via Subversion. In a fresh directory:
 
 ```
@@ -274,7 +274,7 @@ adjust as you see fit:
 
 ```
 From: Release Manager
-To: dev@carbondata.incubator.apache.org
+To: dev@carbondata.apache.org
 Subject: [VOTE] Apache CarbonData Release x.x.x
 
 Hi everyone,
@@ -315,7 +315,7 @@ separate email. Here’s an email template; please adjust as you see fit.
 
 ```
 From: Release Manager
-To: dev@carbondata.incubator.apache.org
+To: dev@carbondata.apache.org
 Subject: [RESULT][VOTE] Apache CarbonData Release x.x.x
 
 I'm happy to announce that we have unanimously approved this release.
@@ -334,63 +334,6 @@ Thanks everyone!
 While in incubation, the Apache Incubator PMC must also vote on each release, using the same

 process as above. Start the review and vote thread on the `general@incubator.apache.org`
list.
 
-```
-From: Release Manager
-To: general@incubator.apache.org
-Cc: dev@carbondata.apache.org
-Subject: [VOTE] Apache CarbonData release x.x.x-incubating
-
-Hi everyone,
-Please review and vote on the release candidate for the Apache CarbonData version x.x.x-incubating,
- as follows:
- 
-[ ] +1, Approve the release
-[ ] -1, Do not approve the release (please provide specific comments)
-
-The complete staging area is available for your review, which includes:
-* JIRA release notes [1],
-* the official Apache source release to be deployed to dist.apache.org [2],
-* all artifacts to be deployed to the Maven Central Repository [3],
-* source code tag "x.x.x" [4],
-* website pull request listing the release [5].
-
-The Apache CarbonData community has unanimously approved this release [6].
-
-As customary, the vote will be open for at least 72 hours. It is adopted by
-a majority approval with at least three PMC affirmative votes. If approved,
-we will proceed with the release.
-
-Thanks!
-
-[1] link
-[2] link
-[3] link
-[4] link
-[5] link
-[6] lists.apache.org permalink to the vote result thread, e.g.,  https://lists.apache.org/thread
-.html/32c991987e0abf2a09cd8afad472cf02e482af02ac35418ee8731940@%3Cdev.carbondata.apache.org%3E
-```
-
-If passed, close the voting and summarize the results:
- 
-```
-From: Release Manager
-To: general@incubator.apache.org
-Cc: dev@carbondata.apache.org
-Subject: [RESULT][VOTE] Apache CarbonData release x.x.x-incubating
-
-There are XXX approving votes, all of which are binding:
-* approver 1
-* approver 2
-* approver 3
-* approver 4
-
-There are no disapproving votes.
-
-We'll proceed with this release as staged.
-
-Thanks everyone!
-```
 
 _Checklist to proceed to the final step:_
 


Mime
View raw message