tree e7edcfd685d7c2a8b32a5b5d136e0b03727b52f5
parent 78acec975787366c271c3eb7b8b9d8c2e7ae0c26
author James E. Blair <jeblair@openstack.org> 1390599531 -0800
committer James E. Blair <jeblair@openstack.org> 1392663949 -0800

Move the merger to a JSON-compatible API

In order to split out the merger as a new component, remove any
direct Zuul model object manipulation, instead passing in a
lists of dictionaries for merge instructions.  Change the merger
algorithm so that it is compatible with this new method and makes
no assumptions about whether it has merged any changes previously.

There is likely to be a minor performance impact as some information
which was previously kept in-memory will now be fetched from the git
index.

The merger is also no-longer pre-populated with clones of git repos
at startup.  Some tests were adjusted to accomodate this.

Change-Id: I3df86ae36b4969d568d1fb03df1e6569553d1226