EventStore/EventStore — pull request #342 by pgermishuys (2014-12-27 17:37:41+00:00)
Title: Fix non-deterministic ordering issue

When the options come in to be saved, we set it as "Update" in the source. After we determine which options are to be saved, we can set it to "Config File" to determine any conflicts due to our options precedence.