juju/juju-gui — pull request #573 by hatched (2014-09-22 19:43:09+00:00)
Title: Create a conflicted fields attribute in services models

In order to properly show conflicted fields in an ecs'd world we need to track which fields are actually in conflict with the environment and the ecs records at all times. This change breaks the databinding conflict engine because we no longer update the services config values if the user has changed them. Future branches will re-enable the conflict UI using this conflicted fields attribute.