[obs-commits] [openSUSE/open-build-service] dc9b32: [api] Fix infinite recursion for update_from_xml

Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: dc9b32abfd51f9de271b2777e5946b09189d9c05 https://github.com/openSUSE/open-build-service/commit/dc9b32abfd51f9de271b27... Author: chrisbr Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M src/api/app/models/project.rb Log Message: ----------- [api] Fix infinite recursion for update_from_xml Introduced by a merge conflict. Commit: d87632f62dc2705bd03b29fd6e56d2816a381cb4 https://github.com/openSUSE/open-build-service/commit/d87632f62dc2705bd03b29... Author: Christian Bruckmayer Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M src/api/app/models/project.rb Log Message: ----------- Merge pull request #1120 from ChrisBr/fix_wrapper_method [api] Fix infinite recursion for update_from_xml Compare: https://github.com/openSUSE/open-build-service/compare/e89e4e145278...d87632...