DaanHoogland commented on issue #3304: server: Fix exception while update
domain resource count (#3204)
URL: https://github.com/apache/cloudstack/pull/3304#issuecomment-495201697
closing, setting ```git config global merge.renamelimit=5635``` would have
done the trick.
DaanHoogland commented on issue #3304: server: Fix exception while update
domain resource count (#3204)
URL: https://github.com/apache/cloudstack/pull/3304#issuecomment-495144154
@blueorangutan test
This is an automated
DaanHoogland commented on issue #3304: server: Fix exception while update
domain resource count (#3204)
URL: https://github.com/apache/cloudstack/pull/3304#issuecomment-488214271
@rhtyd fwd-merge did not work due to the file being moved (out of git bounds)
DaanHoogland commented on issue #3304: server: Fix exception while update
domain resource count (#3204)
URL: https://github.com/apache/cloudstack/pull/3304#issuecomment-487505822
@ustcweizhou same conflict, this was quicker
DaanHoogland commented on issue #3304: server: Fix exception while update
domain resource count (#3204)
URL: https://github.com/apache/cloudstack/pull/3304#issuecomment-487491405
@ustcweizhou , i redid your PR because it wouldn't fwd-merge.