Re: Rebase and squash before merging PRs

On the PR UI page, you can do that by pull down the the menu when you are ready to merge. Remember to use "Rebase and merge". ​ Not sure if this is useful to everyone, but when I push a subsequent commit to my feature branch, I always use "force push", so that it's only one commit I need to

Re: Rebase and squash before merging PRs

One helpful Git configuration I use which can help reduce merge commits is to set the default action to rebase when doing a pull. To set this a global configuration default on your system, do the following command: git config --global pull.rebase true --Mark On Thu, Oct 5, 2017 at 3:00 PM,

Re: Rebase and squash before merging PRs

Does anyone happen to know if “squash and merge” also does a rebase or not? I’ve been hesitant to use that button since I’m not sure what exact sequence of git commands it corresponds to. > On Oct 5, 2017, at 3:59 PM, Jason Huynh wrote: > > I think we can also use "squash

Re: Rebase and squash before merging PRs

If you want to preserve all commits use rebase and merge. If you want a single commit then use squash and merge, which rebases, squashes, and merges. Both options update the commit info with the person performing the merge. Personally though I think you should be asking contributors to rebase

Re: Rebase and squash before merging PRs

I like that idea - sounds comfortably similar to my pre-gitbox process. On Thu, Oct 5, 2017 at 5:24 PM, Jacob Barrett wrote: > You can’t use the UI to just rebase. You would do that on your local repo > and force push your branch. You could even take that time to squash >

[ANNOUNCE] Spring Session Data Geode 2.0.0.M2 Available...

Greetings Apache Geode Community- I am pleased to announce 1 more release related to Apache Geode, *Spring Session* for Apache Geode 2.0.0.M2 (milestone 2) is now available. This release brings with some updates and improvements... 1. *Upgrades* to... -- *Spring Framework* 5 -- *Spring

Re: Rebase and squash before merging PRs

On Thu, Oct 5, 2017 at 3:14 PM, Jinmei Liao wrote: > Not sure if this is useful to everyone, but when I push a subsequent commit > to my feature branch, I always use "force push", so that it's only one commit > I need to rebase to develop. > > I use force push when I've made

[Spring CI] Spring Data GemFire > Nightly-ApacheGeode > #700 was SUCCESSFUL (with 2182 tests). Change made by John Blum.

--- Spring Data GemFire > Nightly-ApacheGeode > #700 was successful. --- Scheduled with changes by John Blum. 2184 tests in total.

Re: Rebase and squash before merging PRs

Jake, Say I have a PR with the original commit plus two more to incorporate reviewer suggestions. How is it possible within the github UI to just rebase without also merging? I don't see that choice in the gitbox pulldown menu. On Thu, Oct 5, 2017 at 4:59 PM, Jacob Barrett

Re: Rebase and squash before merging PRs

You can’t use the UI to just rebase. You would do that on your local repo and force push your branch. You could even take that time to squash yourself. Then the pull would show your new rebased commits for someone to approve and merge (squash too if they want). -Jake > On Oct 5, 2017, at

Looking for geode-core dunit using 5 dunit VMs

I need help looking for a geode-core dunit test that is using 5 dunit VMs instead of 4. I want to review that test and then decide what to do with the DistributedTest framework tests that might run after it (the tests that verify that dunit itself is ok). This test is doing something like this:

Re: Looking for geode-core dunit using 5 dunit VMs

I found them (or some of them): 1) LocatorDUnitTest.testMultipleLocatorsRestartingAtSameTime() <- uses 5 VMs in addition to controller & locator 2) LocatorDUnitTest.testMultipleLocatorsRestartingAtSameTimeWithMissingServers() <- uses 5 VMs in addition to controller & locator 3)

Re: Looking for geode-core dunit using 5 dunit VMs

All of the WAN dunit tests use more than 5 VMS, but I'm not sure you want those. Those are anything extending WANTestBase. I also see LocatorDUnitTest testMultipleLocatorsRestartingAtSameTime does as well. Thanks, Barry Oglesby On Thu, Oct 5, 2017 at 10:05 AM, Kirk Lund

[ANNOUNCE] Spring Data Geode 2.0.0.RELEASE (Kay GA) Available...

Dear Geode Community- After almost 1 year of radio silence on all things related to *Spring Data Geode* for Apache Geode, it is my pleasure to inform you that *Spring Data Geode* *2.0.0.RELEASE* (Kay GA) is now available! [1] Many things have happened since my last announcement. First, *Spring

Re: [DISCUSS] Removal of "Submit an Issue" from Geode webpage

Done. On Mon, Oct 2, 2017 at 10:05 AM, Dave Barnes wrote: > Created GEODE-3726 (https://issues.apache.org/jira/browse/GEODE-3726) > > On Mon, Oct 2, 2017 at 9:07 AM, Dave Barnes wrote: > >> I volunteer to handle this, beginning with a JIRA ticket. >>

Re: Rebase and squash before merging PRs

Here are the docs from github: https://help.github.com/articles/about-pull-request-merges/ Based on those and using squash and commit for some of my merges, it looks like it does what we want: just one commit for the merge of the feature branch. Note that "rebase and merge" in github does not

Re: [ANNOUNCE] Spring Data Geode 2.0.0.RELEASE (Kay GA) Available...

Great work John. Congratulations..! Nilkanth. On Fri, Oct 6, 2017 at 12:09 AM, Jagdish Mirani wrote: > Cool - great progress John. > Jag > > On Thu, Oct 5, 2017 at 10:51 AM, Michael Stolz wrote: > > > Wow! Great stuff John! > > > > -- > > Mike Stolz > >

Re: [ANNOUNCE] Spring Data Geode 2.0.0.RELEASE (Kay GA) Available...

NICE WORK John!!! Always proactive and up-to-date as always! --Udo On Thu, Oct 5, 2017 at 10:35 AM, John Blum wrote: > Dear Geode Community- > > After almost 1 year of radio silence on all things related to *Spring > Data Geode* for Apache Geode, it is my pleasure to inform

Re: [ANNOUNCE] Spring Data Geode 2.0.0.RELEASE (Kay GA) Available...

Cool - great progress John. Jag On Thu, Oct 5, 2017 at 10:51 AM, Michael Stolz wrote: > Wow! Great stuff John! > > -- > Mike Stolz > Principal Engineer, GemFire Product Lead > Mobile: +1-631-835-4771 > > On Thu, Oct 5, 2017 at 6:35 PM, John Blum wrote: > >

Re: Rebase and squash before merging PRs

I think we can also use "squash and merge" if wanting to squash commits before merging. This would allow you not to have to force push every time. On Thu, Oct 5, 2017 at 3:15 PM Jinmei Liao wrote: > On the PR UI page, you can do that by pull down the the menu when you are >

Re: New client protocol configuration

One thing also to consider if you modifying the config structure, is an evented config structure, so that registrants get callbacks if changes are made that are real-time. Thanks, Mark > On Oct 5, 2017, at 12:49 PM, Galen O'Sullivan wrote: > > I don't care too much

Re: New client protocol configuration

I don't care too much about exactly what the configuration looks like, but I want it to be unified, and I want it to be set when the cache starts. Checking system properties throughout the codebase whenever we feel like is a bit too magic for me. In addition, it seems that in order to add a new

Re: New client protocol configuration

I was doing something similar to that for some other projects and found that cfg4j [1] to be a very clean and good framework to keep the format of the configuration generic and dynamic. Built-in support for Yaml and property files and can also ready from multiple sources like Git, Consul,

Rebase and squash before merging PRs

I’ve been seeing a lot more merge commits on develop since we moved to Gitbox. Just wanted to give everyone a friendly reminder to please rebase before merging to keep our git history tidy and readable. Thanks, Jared