Re: How to submit PRs for dependant changes?

2020-04-26 Thread Reuven Lax
For c), I don't think you need merge resolutions. You can submit each
commit in a separate PR, and rebase your branch after each one.

On Sun, Apr 26, 2020 at 10:25 AM Niel Markwick  wrote:

>
> Hey Beam devs...
>
> I have 4 changes to submit as PRs to fix 4 independent issues in the
> io.gcp.SpannerIO class.
>
> The PRs are notionally independent, but will cause merge conflicts if
> submitted separately, as the fix for each issue will change code related to
> the fix for some of the others.
>
> How do you prefer the PRs to be submitted?
>
> a) one single PR with 4 sequential commits within it
> b) one single PR with all changes squashed.
> c) 4 separate conflicting PRs which will have to be merged separately, and
> a merge conflict resolution after each one.
>
> a) is how it is in my repo.
> b) would be easy, but less clear what the changes were for.
> c) I guess would be clearest in the Beam changelog.
>
> If the answer is a) or b), how would I specify multiple JIRA tickets in
> the PR title?
>
> Thanks!
>
> --
> 
> * •  **Niel Markwick*
> * •  *Cloud Solutions Architect 
> * •  *Google Belgium
> * •  *ni...@google.com
> * •  *+32 2 894 6771
>
>
> Google Belgium NV/SA, Steenweg op Etterbeek 180, 1040 Brussel, Belgie. RPR: 
> 0878.065.378
>
> If you have received this communication by mistake, please don't forward
> it to anyone else (it may contain confidential or privileged information),
> please erase all copies of it, including all attachments, and please let
> the sender know it went to the wrong person. Thanks
>


How to submit PRs for dependant changes?

2020-04-26 Thread Niel Markwick
Hey Beam devs...

I have 4 changes to submit as PRs to fix 4 independent issues in the
io.gcp.SpannerIO class.

The PRs are notionally independent, but will cause merge conflicts if
submitted separately, as the fix for each issue will change code related to
the fix for some of the others.

How do you prefer the PRs to be submitted?

a) one single PR with 4 sequential commits within it
b) one single PR with all changes squashed.
c) 4 separate conflicting PRs which will have to be merged separately, and
a merge conflict resolution after each one.

a) is how it is in my repo.
b) would be easy, but less clear what the changes were for.
c) I guess would be clearest in the Beam changelog.

If the answer is a) or b), how would I specify multiple JIRA tickets in the
PR title?

Thanks!

-- 

* •  **Niel Markwick*
* •  *Cloud Solutions Architect 
* •  *Google Belgium
* •  *ni...@google.com
* •  *+32 2 894 6771

Google Belgium NV/SA, Steenweg op Etterbeek 180, 1040 Brussel, Belgie.
RPR: 0878.065.378

If you have received this communication by mistake, please don't forward it
to anyone else (it may contain confidential or privileged information),
please erase all copies of it, including all attachments, and please let
the sender know it went to the wrong person. Thanks


Re: [RESULT][VOTE] Accept the Firefly design donation as Beam Mascot - Deadline Mon April 6

2020-04-26 Thread Maximilian Michels
Hey Maria,

I can testify :)

Cheers,
Max

On 23.04.20 20:49, María Cruz wrote:
> Hi everyone!
> It is amazing to see how this process developed to collaboratively
> create Apache Beam's mascot. Thank you to everyone who got involved! 
> I would like to write a blogpost for the Beam website, and I wanted to
> ask you: would anyone like to offer their testimony about the process of
> creating the Beam mascot, and what this means to you? Everyone's
> testimony is welcome! If you witnessed the development of a mascot for
> another open source project, even better =) 
> 
> Please feel free to express interest on this thread, and I'll reach out
> to you off-list. 
> 
> Thanks, 
> 
> María
> 
> On Fri, Apr 17, 2020 at 6:19 AM Jeff Klukas  > wrote:
> 
> I personally like the sound of "Datum" as a name. I also like the
> idea of not assigning them a gender.
> 
> As a counterpoint on the naming side, one of the slide decks
> provided while iterating on the design mentions:
> 
> > Mascot can change colors when it is “full of data” or has a “batch
> of data” to process.  Yellow is supercharged and ready to process!
> 
> Based on that, I'd argue that the mascot maps to the concept of a
> bundle in the beam execution model and we should consider a name
> that's a play on "bundle" or perhaps a play on "checkpoint".
> 
> On Thu, Apr 16, 2020 at 3:44 PM Julian Bruno  > wrote:
> 
> Hi all,
> 
> While working on the design of our Mascot
> Some ideas showed up and I wish to share them.
> In regard to Alex Van Boxel's question about the name of our Mascot.
>  
> I was thinking about this yesterday night and feel it could be a
> great idea to name the Mascot "*Data*" or "*Datum*". Both names
> sound cute and make sense to me. I prefer the later. Datum means
> a single piece of information. The Mascot is the first piece of
> information and its job is to collect batches of data and
> process it. Datum is in charge of linking information together.
> 
> In addition, our Mascot should have no gender. Rendering it
> accessible to all users. 
> 
> Beam as a name for the mascot is pretty straight forward but I
> think there are many things carrying that same name already.
> 
> What do you think?
> 
> Looking forward to hearing your feedback. Names are important
> and I feel it can expand the personality and create a cool
> background for our Mascot.
> 
> Cheers!
> 
> Julian 
> 
> On Mon, Apr 13, 2020, 3:40 PM Kyle Weaver  > wrote:
> 
> Beam Firefly is fine with me (I guess people tend to forget
> mascot names anyway). But if anyone comes up with something
> particularly cute/clever we can consider it.
> 
> On Mon, Apr 13, 2020 at 6:33 PM Aizhamal Nurmamat kyzy
> mailto:aizha...@apache.org>> wrote:
> 
> @Alex, Beam Firefly?
> 
> On Thu, Apr 9, 2020 at 10:57 PM Alex Van Boxel
> mailto:a...@vanboxel.be>> wrote:
> 
> We forgot something      
> 
> ...
> 
> ...
> 
> it/she/he needs a *name*!
> 
> 
>  _/
> _/ Alex Van Boxel
> 
> 
> On Fri, Apr 10, 2020 at 6:19 AM Kenneth Knowles
> mailto:k...@apache.org>> wrote:
> 
> Looking forward to the guide. I enjoy doing
> (bad) drawings as a way to relax. And I want
> them to be properly on brand :-)
> 
> Kenn
> 
> On Thu, Apr 9, 2020 at 10:35 AM Maximilian
> Michels mailto:m...@apache.org>>
> wrote:
> 
> Awesome. What a milestone! The mascot is a
> real eye catcher. Thank you
> Julian and Aizhamal for making it happen.
> 
> On 06.04.20 22:05, Aizhamal Nurmamat kyzy wrote:
> > I am happy to announce that this vote has
> passed, with 13 approving +1
> > votes, 5 of which are binding PMC votes.
> >
> > We have the final design for the Beam
> Firefly! Yahoo!
> >
> > Everyone have a great week!
> >
> >
> >
> > On Mon, Apr 6, 2020 at 9:57 AM David
> Morávek