Sounds good. I just cherry picked those two commits into the site branch so we can continue to deploy from there.
-- Michael Mior mm...@apache.org Le jeu. 12 juil. 2018 à 20:04, Julian Hyde <jh...@apache.org> a écrit : > > Except for the two that you just added I think all the ones we need are > already in the “site” branch. > > It’s not a big deal - it’s just supposed to make it easier to deploy the site > between releases and not accidentally deploy documentation for unreleased > features. Which you seemed to manage to do just fine. > > Julian > > > > On Jul 12, 2018, at 5:00 PM, Michael Mior <mm...@apache.org> wrote: > > > > Ack, sorry about that. I forgot that we agreed to change the process. > > Mea culpa. I suppose now I should cherry pick commits made to master > > that have been deployed to the site branch? (And stop doing this in > > the future of course :) > > > > -- > > Michael Mior > > mm...@apache.org > > Le jeu. 12 juil. 2018 à 17:53, Julian Hyde <jh...@apache.org> a écrit : > >> > >> Michael, > >> > >> When you update the site, rather than making the changes on the “master” > >> branch, please make the changes on the “site” branch and then cherry-pick > >> those changes to the “master" branch. > >> > >> The goal is that the “site” branch is always in sync with the currently > >> published site. > >> > >> At some times, there may be some changes to the site directory on the > >> “master" branch that are not published because they relate to product > >> features that have not yet been released. Those changes will be moved to > >> the “site” branch at the release. > >> > >> Julian > >> > >> > >>> On Jul 9, 2018, at 4:22 PM, mm...@apache.org wrote: > >>> > >>> Repository: calcite > >>> Updated Branches: > >>> refs/heads/master 0204f2860 -> f143d062a > >>> > >>> > >>> Add Kevin to PMC > >>> > >>> > >>> Project: http://git-wip-us.apache.org/repos/asf/calcite/repo > >>> Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/f143d062 > >>> Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/f143d062 > >>> Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/f143d062 > >>> > >>> Branch: refs/heads/master > >>> Commit: f143d062abf139ef26faec1bf19055c117ef3c52 > >>> Parents: 0204f28 > >>> Author: Michael Mior <mm...@uwaterloo.ca> > >>> Authored: Mon Jul 9 19:22:21 2018 -0400 > >>> Committer: Michael Mior <mm...@uwaterloo.ca> > >>> Committed: Mon Jul 9 19:22:21 2018 -0400 > >>> > >>> ---------------------------------------------------------------------- > >>> site/_data/contributors.yml | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> ---------------------------------------------------------------------- > >>> > >>> > >>> http://git-wip-us.apache.org/repos/asf/calcite/blob/f143d062/site/_data/contributors.yml > >>> ---------------------------------------------------------------------- > >>> diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml > >>> index 412cea8..542fd14 100644 > >>> --- a/site/_data/contributors.yml > >>> +++ b/site/_data/contributors.yml > >>> @@ -107,7 +107,7 @@ > >>> apacheId: krisden > >>> githubId: risdenk > >>> org: > >>> - role: Committer > >>> + role: PMC > >>> - name: Laurent Goujon > >>> apacheId: laurent > >>> githubId: laurentgo > >>> > >> >
