Sounds like we're in agreement. I did a quick dry run and agree with Nick,
easy fix. I'm ready to push but want to be sure everyone's good with the
history. Here's what it will look like:
commit 8b4fa79d19be992ad270df7d1780db7f4b8ce176
Author: kylerichardson <kylerichards...@gmail.com>
Date: Mon Feb 27 21:05:46 2017 -0500
METRON-646 Add index templates to metron-docker (kylerichardson) closes
apache/incubator-metron#441
commit 1e1b658b76f5c959bcebdf824372eea0d680d3f0
Author: Kyle Richardson <kylerichard...@apache.org>
Date: Mon Feb 27 20:57:30 2017 -0500
Revert "METRON-646 Add index templates to metron-docker (kylerichardson
via merrimanr) closes apache/incubator-metron#441"
This reverts commit 41fc0ddc9881d9cfdd8bae129c0bb7800a116d4c. Change
will be re-commited with full author details.
commit b34037202775f78733cd21cc0fb4159991f29cd3
Author: nickwallen <n...@nickallen.org>
Date: Mon Feb 27 18:02:36 2017 -0500
METRON-686 Record Rule Set that Fired During Threat Triage (nickwallen)
closes apache/incubator-metron#438
commit 41fc0ddc9881d9cfdd8bae129c0bb7800a116d4c
Author: kylerichardson <null>
Date: Mon Feb 27 11:38:55 2017 -0600
METRON-646 Add index templates to metron-docker (kylerichardson via
merrimanr) closes apache/incubator-metron#441
commit 164d602d87ee6203514b27897f68bfa9aa1f0377
Author: cstella <ceste...@gmail.com>
Date: Mon Feb 27 09:13:15 2017 -0500
METRON-742: Generated code for profile window selector DSL did not get
committed as part of METRON-690 closes apache/incubator-metron#466
-Kyle
On Mon, Feb 27, 2017 at 8:53 PM, Casey Stella <ceste...@gmail.com> wrote:
> Nick, what are your thoughts on adjusting the script to error out or prompt
> for an email address if one can't be found?
>
> On Mon, Feb 27, 2017 at 8:51 PM, Nick Allen <n...@nickallen.org> wrote:
>
> > I think revert and commit again is the best way to go. Not a big deal.
> >
> > On Mon, Feb 27, 2017 at 6:55 PM, Casey Stella <ceste...@gmail.com>
> wrote:
> >
> > > I think it should be changed, but I'm not sure how to change it. I
> think
> > it
> > > should be changed because our git history is our legal trail of
> > > attribution. Mucking with it is relatively serious business.
> > >
> > > As to how, normally I'd say git commit --amend --author
> "kylerichardson <
> > > kylerichards...@gmail.com>" if we act before the next commit and a git
> > > rebase otherwise, but it's pushed and rewriting history for a push'd
> > commit
> > > has consequences. Not the least of which the scary force'd push. The
> > > challenge here is that all forked repos during this period between the
> > > wrong commit and the correction commit will be based on a dead
> branch. I
> > > guess I would vote for 1, the revert and then the re-commit.
> > >
> > > I'd like to understand a bit more about how this happened. Ryan, can
> you
> > > walk it through how you did the commit so we can avoid it in the
> future?
> > >
> > > Casey
> > >
> > >
> > > On Mon, Feb 27, 2017 at 4:04 PM, Kyle Richardson <
> > > kylerichards...@gmail.com>
> > > wrote:
> > >
> > > > Ok, so here's the story... Ryan was nice enough to commit my recent
> PR
> > > and
> > > > for whatever reason my github username but not my email address
> appears
> > > in
> > > > the commit author (see below).
> > > >
> > > > commit 41fc0ddc9881d9cfdd8bae129c0bb7800a116d4c
> > > > Author: kylerichardson <null>
> > > > Date: Mon Feb 27 11:38:55 2017 -0600
> > > >
> > > > METRON-646 Add index templates to metron-docker (kylerichardson
> via
> > > > merrimanr) closes apache/incubator-metron#441
> > > >
> > > > My question is can it be left as is or does it need to include the
> > email
> > > > address per apache?
> > > >
> > > > If it needs to be changed, what are the acceptable options?
> > > >
> > > > (1) commit a revert and re-commit; maintains a record of everything
> > > > (2) rebase one back, update, and force a push; like it never happened
> > > > (3) another option I haven't considered?
> > > >
> > > > -Kyle
> > > >
> > >
> >
>
