[Bro-Dev] Directly committing to master

[Seth Hall]

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.

  .Seth

--
Seth Hall
International Computer Science Institute
(Bro) because everyone has a network
http://www.bro-ids.org/