On Fri, Feb 27, 2009 at 10:15:21AM +1100, Mark Goodwin wrote:
> Martin Hicks wrote:
>> I've pushed changes to the "master" branch in my git repository on oss.
>> This is my first crack at issuing a stable 2.7.9 release.
>>
>> git://oss.sgi.com/mort/pcp.git
>>
>> I'd still like to merge in the lustre PMDA and the cluster PMDA that are
>> still on my "dev" branch.
>
> I'm planning on setting up a small lustre filesystem mid-next
> week - that's the earliest I can review and test this stuff.
> And now a perl flavour of this seems to be emerging ..
>
> In any case, please consider the cluster PMDA reviewed from my
> point of view (I reviewed Michael's changes a month or two ago).
> I'll be testing that next week too.
Okay. I don't really know where I can find a working lustre install at
SGI. One of those things that I should look into.
>>
>> My master branch is currently the 2.7.8-20090129 tag, plus I cherry
>> picked the changes forward, excluding the ones related to libpcp_gui
>>
>
> not sure if Nathan would rather the release included or excluded
> the gui re-org .. I think he said last night that the reorg is
> basically done .. Nathan?
>
>>
>> If I can get a quick review on the two other PMDAs I think I'll be ready
>> to merge them into the dev branch and cherry pick them over to master.
>
> mid next week for those, if you want full review including testing,
> else just forge ahead anyway.
>
> BTW, the 'master' branch is the traditional name for a dev tree
> in git parlance. We have dev and master, but that should really
> be dev and stable. I propose we rename 'master' to 'stable',
> comments? That's a simple incarnation of 'git branch -m master stable'
> but not sure what impact it would have on everyone's clones.
I agree its confusing in the current state. I'm not sure if everyone
will pick up the new branch. You might have to do a 'git remote update
origin' to get the new branches.
mh
|