/charm-tools

Adjusted the deep merge operation to support merging of lists #103

Merged
merged 3 commits into from Feb 18, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.0
2 participants
@chuckbutler @marcoceppi
@chuckbutler
Contributor

chuckbutler commented Feb 5, 2016

This PR is still in flight as I have not added tests for this change, but when testing using the given example by @marcoceppi here https://gist.github.com/marcoceppi/ad318d081e3b30857819
@marcoceppi
Owner

marcoceppi commented Feb 7, 2016

Matt fixed the errored test in #104 rebase and try again to pass CI

@marcoceppi marcoceppi added this to the 2.0 milestone Feb 12, 2016

chuckbutler added some commits Feb 5, 2016

@chuckbutler
Adjusted the deep merge operation to support merging of lists
2aaf55e
@chuckbutler
Working list merge in utils.py of the tactics builder
fdd516b
@chuckbutler
Patched a hinky test by changing the object hash?

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
5bf71ad
@marcoceppi
Owner

marcoceppi commented Feb 18, 2016

LGTM ⛵️

marcoceppi added a commit that referenced this pull request Feb 18, 2016

@marcoceppi
Merge pull request #103 from chuckbutler/support-lists-when-merging-l… 
…ayers

Adjusted the deep merge operation to support merging of lists
7bf9237

@marcoceppi marcoceppi merged commit 7bf9237 into juju:master Feb 18, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@marcoceppi
Owner

marcoceppi commented Mar 22, 2016

Fixes #85
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment