[Bro-Dev] Directly committing to master

Adam J. Slagell slagell at ncsa.illinois.edu
Sat Jul 30 20:06:24 PDT 2011


On Jul 30, 2011, at 10:03 PM, Seth Hall wrote:

> 
> On Jul 30, 2011, at 4:30 PM, Gregor Maier wrote:
> 
>> recently there have been a bunch of commits directly on master. Is there 
>> a particular reason for that? I would really prefer it if we could stick 
>> to our development process where work gets committed to topic branches 
>> and the topic branches are then merged into master. (These merges can 
>> happen often. I wouldn't mind that)
> 
> 
> We had agreed that script development would happen directly on master temporarily but I can definitely see that causing trouble.  I think I agree and I'll move that development over to a branch.
> 
> The SSL fix was different.  It was a very simple change and the absence of the fix was causing trouble for a few people.

Still, isn't that kind of what fastpath is for?

------
Adam J. Slagell, CISSP
Sr. Security Engineer
National Center for Supercomputing Applications
University of Illinois at Urbana-Champaign
www.slagell.info
217.244.8965









More information about the bro-dev mailing list