[CRIU] Re: [crtools-bot]

[Cyrill Gorcunov]

On Mon, Jan 30, 2012 at 01:05:43PM +0400, Cyrill Gorcunov wrote:
> The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
> ------>
> commit 162bcdeacfcf3a2f6edbda115a8a98a75bc2b834
> Merge: beb158a d40e50d
> Author: Cyrill Gorcunov <gorcunov at openvz.org>
> Date:   Mon Jan 30 13:04:57 2012 +0400
> 
>     Merge branch 'pre'
>     
>     * pre:
>       zdtm: Tests for xids and caps
>     
>     Conflicts:
>     	test/zdtm.sh
>     
>     The sockets00 test was added earlier.
>     

Pavel, I remember what you were saying about merge commits,
but this one simply 'cause it's pretty trivial

@@@ -25,7 -25,8 +25,9 @@@ $ZP/streaming/pipe_shared0
  $ZP/transition/file_read
  $ZP/transition/fork
  $ZP/static/zombie00
 +$ZP/static/sockets00
+ $ZP/static/pid00
+ $ZP/static/caps00
  $ZP/static/cmdlinenv00
  $ZP/static/socket_listen"

so when I;ve got it I choose not to rebase all series but
just resolve it instead.

	Cyrill