Joshua Harlow 8867c8096b Fix the cloud config merging so that it is backwards compat. ...

The new change for merging works well in the mergedict case
but the default merging type for cloud config needs to reflect
how yaml was loaded in bulk, which is the same as the replacing
keys merging type that is now provided.

2013-05-09 22:34:31 -07:00

..

expected1.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

expected2.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

expected3.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

expected4.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

expected5.yaml

More merging adjustments.

2013-05-03 14:41:28 -07:00

expected6.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

expected7.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

expected8.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

expected9.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

expected10.yaml

1 more test that does some list appending.

2013-05-07 21:42:32 -07:00

expected11.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

expected12.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

source1-1.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source1-2.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source2-1.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source2-2.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source3-1.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source3-2.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source4-1.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source4-2.yaml

Add a bunch of new merging test files + runner.

2013-04-23 22:53:53 -07:00

source5-1.yaml

More merging adjustments.

2013-05-03 14:41:28 -07:00

source5-2.yaml

More merging adjustments.

2013-05-03 14:41:28 -07:00

source6-1.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source6-2.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source7-1.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source7-2.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source8-1.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source8-2.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source9-1.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source9-2.yaml

A few more test files.

2013-05-07 21:38:06 -07:00

source10-1.yaml

1 more test that does some list appending.

2013-05-07 21:42:32 -07:00

source10-2.yaml

1 more test that does some list appending.

2013-05-07 21:42:32 -07:00

source11-1.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

source11-2.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

source11-3.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

source12-1.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00

source12-2.yaml

Fix the cloud config merging so that it is backwards compat.

2013-05-09 22:34:31 -07:00