[3/3] calcite git commit: Site: Add committer Kevin Risden

[jh...@apache.org]

Site: Add committer Kevin Risden

Fix ordering of contributors.yml.

Add instructions for maintaining the "site" branch when there are
changes to the site that we do not wish to deploy until the next
release.


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

Branch: refs/heads/site
Commit: dfe7a2fef13c5454eb5e56ac33736d9b3d1d7128
Parents: 2799b65
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Apr 25 10:52:43 2018 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Apr 25 10:52:43 2018 -0700

----------------------------------------------------------------------
 site/README.md              | 19 +++++++++++++++++++
 site/_data/contributors.yml | 23 ++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/dfe7a2fe/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 3f97cc7..07df61f 100644
--- a/site/README.md
+++ b/site/README.md
@@ -66,3 +66,22 @@ generate files to `site/target/avatica`, which becomes an
 [avatica](http://calcite.apache.org/avatica)
 sub-directory when deployed. See
 [Avatica site README](../avatica/site/README.md).
+
+## Site branch
+
+We want to deploy project changes (for example, new committers, PMC
+members or upcoming talks) immediately, but we want to deploy
+documentation of project features only when that feature appears in a
+release. For this reason, we generally edit the site on the "site" git
+branch.
+
+Before making a release, release manager must ensure that "site" is in
+sync with "master". Immediately after a release, the release manager
+will publish the site, including all of the features that have just
+been released. When making an edit to the site, a Calcite committer
+must commit the change to the git "master" branch (as well as
+subversion, to publish the site, of course). If the edit is to appear
+on the site immediately, the committer should then cherry-pick the
+change into the "site" branch.  If there have been no feature-related
+changes on the site since the release, then "site" should be a
+fast-forward merge of "master".
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/calcite/blob/dfe7a2fe/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 7e88e60..4451ff3 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -102,6 +102,11 @@
   githubId: kliewkliew
   org:
   role: Committer
+- name: Kevin Risden
+  apacheId: krisden
+  githubId: risdenk
+  org:
+  role: Committer
 - name: Laurent Goujon
   apacheId: laurent
   githubId: laurentgo
@@ -140,6 +145,11 @@
   githubId: nishantmonu51
   org: Hortonworks
   role: Committer
+- name: Shuyi Chen
+  apacheId: shuyichen
+  githubId: suez1224
+  org: Uber
+  role: Committer
 - name: Slim Bouguerra
   apacheId: bslim
   githubId: b-slim
@@ -166,19 +176,14 @@
   githubId: vvysotskyi
   org:
   role: Committer
-- name: Zhiqiang He
-  apacheId: zhiqianghe
-  githubId: Zhiqiang-He
-  org: Huawei
-  role: Committer
 - name: Zhen Wang
   apacheId: zhenw
   githubId: zinking
   org:
   role: Committer
-- name: Shuyi Chen
-  apacheId: shuyichen
-  githubId: suez1224
-  org: Uber
+- name: Zhiqiang He
+  apacheId: zhiqianghe
+  githubId: Zhiqiang-He
+  org: Huawei
   role: Committer
 # End contributors.yml