<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vyos-cloud-init.git/tests/data/merge_sources/source5-2.yaml, branch rolling</title>
<subtitle> (mirror of https://github.com/vyos/vyos-cloud-init.git)
</subtitle>
<id>https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling</id>
<link rel='self' href='https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling'/>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/'/>
<updated>2013-05-03T21:41:28+00:00</updated>
<entry>
<title>More merging adjustments.</title>
<updated>2013-05-03T21:41:28+00:00</updated>
<author>
<name>Joshua Harlow</name>
<email>harlowja@yahoo-inc.com</email>
</author>
<published>2013-05-03T21:41:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.amelek.net/vyos/vyos-cloud-init.git/commit/?id=4a669649b17cf01b6f89f7902b6683d02ef0bee1'/>
<id>urn:sha1:4a669649b17cf01b6f89f7902b6683d02ef0bee1</id>
<content type='text'>
Looks like this should be in pretty good shape and has passed some
of the basic backwards compat. merging tests that I added.
</content>
</entry>
</feed>
