Merge branch 'master' into 1.0
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
stack/erp5-zope2/TODO
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
stack/erp5-zope2/my.cnf.in
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
stack/erp5-zope2/site.zcml
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
-
Owner
something strange happened with 1.0 branch, using
./update-rc
caused conflict:$ ./update-rc Already on 'master' Your branch is up to date with 'origin/master'. warning: redirecting to https://lab.nexedi.com/nexedi/slapos.git/ Deleted branch 1.0 (was 238bb076b). branch '1.0' set up to track 'origin/1.0'. Switched to a new branch '1.0' HEAD is now at 238bb076b NEO: add profile to use MariaDB 10.4 Auto-merging software/erp5/test/test/test_erp5.py CONFLICT (content): Merge conflict in software/erp5/test/test/test_erp5.py Auto-merging software/neoppod/software-common.cfg Auto-merging software/slapos-master/software.cfg Auto-merging stack/erp5/buildout.hash.cfg CONFLICT (content): Merge conflict in stack/erp5/buildout.hash.cfg Auto-merging stack/erp5/instance-zope.cfg.in Automatic merge failed; fix conflicts and then commit the result.
some commits where both in master and 1.0 with different hashes: db979522 and 238bb076
I don't understand, but this is probably because of some push force:
anyway state seems OK now
Please register or sign in to comment