[ovs-dev] Mea culpa - rewound master branch
Ben Pfaff
blp at ovn.org
Thu Jul 28 16:32:54 UTC 2016
On Thu, Jul 28, 2016 at 12:49:37PM -0300, Flavio Leitner wrote:
> On Wed, Jul 27, 2016 at 11:49:18AM -0700, Ben Pfaff wrote:
> > Some time ago this morning, I accidentally pushed several patches that
> > were still under review to master. I've force-pushed a correction to
> > the branch. My apologies--I hope that this does not screw up anyone's
> > development process in a bad way.
>
> There is another weird one:
> $ git log master..origin/master --oneline
> [...]
> f3edb dpif-netdev: Execute conntrack action.
> b412490 tests: Add test-conntrack pcap test.
> 8cb1462 tests: Add very simple conntrack benchmark.
> * 6c54734 XXX Improve comment.
> e6ef6cc conntrack: Periodically delete expired connections.
> a489b16 conntrack: New userspace connection tracker.
> [...]
Probably should have been squashed before Daniele pushed it, but not
really so bad if that's the only issue.
More information about the dev
mailing list