I just merged PR#15 in to develop. I tried following the instructions on
https://cwiki.apache.org/confluence/display/GEODE/Code+contributions but I
couldn't get things to really work the way I wanted or the way the page
seemed to describe it.

I wanted all three of the following commits to be one commit on today's
date with a single unified commit message including "GEODE-213". The pulled
commit went in for Aug 12 despite attempting to use --rebase instead of
--squash.

If anyone knows git well, please update that wiki page so that we can
cleanly handle pull requests.

commit bbc2a5fa5f0bbcd00a8ab64451a2528a22d88bc0
Merge: 9efe74e 581702a
Author: Kirk Lund <kl...@pivotal.io>
Date:   Wed Aug 19 16:09:21 2015 -0700

    Merge branch 'feature/GEODE-213' into develop

commit 581702ac1d2a9debe8619680d09fa868b9ca8b05
Author: Kirk Lund <kl...@pivotal.io>
Date:   Wed Aug 19 16:01:26 2015 -0700

    GEODE-213: New unit test that confirms bug

commit 65e969439e3c03f5557b2e1adc609c97544ecb2b
Author: Vito Gavrilov <vgavri...@pivotal.io>
Date:   Wed Aug 12 13:13:55 2015 -0700

    Fix JMX Http manager incorrectly treating 'start gateway-sender'
endpoint as 'start gateway-receiver'

<klund@klund-e6420>/c/dev/geode_CLEAN [590]$ git --version
git version 2.4.5

<klund@klund-e6420>/c/dev/geode_CLEAN [594]$ git-flow version
1.8.0 (AVH Edition)

Reply via email to