git://git.onelab.eu / sliceimage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d64caca e7c0f23)
Merge branch 'master' of ssh://git.onelab.eu/git/sliceimage
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 28 Mar 2012 14:20:46 +0000 (16:20 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 28 Mar 2012 14:20:46 +0000 (16:20 +0200)
1  2 
cron.d/sliceimage patch | diff1 | diff2 | blob | history
initscripts/sliceimage patch | diff1 | diff2 | blob | history

diff --cc cron.d/sliceimage
Simple merge
diff --cc initscripts/sliceimage
Simple merge
sliceimage - was vserver-reference