summaryrefslogtreecommitdiff
path: root/cloudinit
AgeCommit message (Expand)Author
2013-05-13Fix how python 2.6 was broken due to new dict syntax.Joshua Harlow
2013-05-10Fixed merging capabilities.Scott Moser
2013-05-09Allow lists to have no_replace option.Joshua Harlow
2013-05-09Adjust comment on why we are merging cloud config the way we are.Joshua Harlow
2013-05-09Fix the cloud config merging so that it is backwards compat.Joshua Harlow
2013-05-07A few more test files.Joshua Harlow
2013-05-03Fix a feature that doesn't yet exist on python 2.6Joshua Harlow
2013-05-03A few pep8/pylint cleanups.Joshua Harlow
2013-05-03A few more tests + cleanings.Joshua Harlow
2013-05-03More merging adjustments.Joshua Harlow
2013-04-25re-work maas datasource and headers call backsScott Moser
2013-04-22Continue working on merging.Joshua Harlow
2013-04-18Remove str merging for now.Joshua Harlow
2013-04-18Pull from head and a couple more tweaks.Joshua Harlow
2013-04-18Adjust how merging is done.Joshua Harlow
2013-04-17Handle namespacing issues in merger.Scott Moser
2013-04-17Altering the order of merging.Joshua Harlow
2013-04-17add debug output to ccfg-merge-debugScott Moser
2013-04-17Handle namespacing issues.Joshua Harlow
2013-04-10improvments to systemd/fedora 18 supportGreg Padgett
2013-04-03invoke dist-upgrade instead of upgrade for apt upgradesScott Moser
2013-04-03invoke 'dist-upgrade' instead of 'upgrade' on for upgrades.Scott Moser
2013-03-26compatibility fixes for Fedora and RHELGreg Padgett
2013-03-26handle errors in cc_reizefs betterScott Moser
2013-03-20pep8Scott Moser
2013-03-20remove some churnScott Moser
2013-03-19Add doc about issue 1401 in boto.Joshua Harlow
2013-03-19Move back to using boto for now.Joshua Harlow
2013-03-19fix typoScott Moser
2013-03-19make get_instance_userdata and get_instance_metadata more like botosScott Moser
2013-03-19set 'allow_redirects' to True by defaultScott Moser
2013-03-19do not bother retrying on ssl errorsScott Moser
2013-03-19appease pylint and pep8Scott Moser
2013-03-19merge from trunk rev 800Scott Moser
2013-03-19pylint fixesScott Moser
2013-03-19merge from trunk at revno 799Scott Moser
2013-03-13Fix how the http error doesn't always have the response attachedJoshua Harlow
2013-03-13Update to handle requests >= 1.0 which doesn't use the config dict.Joshua Harlow
2013-03-13fix / workaround potential for socket.getaddrinfo to raise socket.errorScott Moser
2013-03-10util.parse_mount_info(): handle short lines.Blair Zajac
2013-03-10Refactor util.get_mount_info() to facilitate unit testing.Blair Zajac
2013-03-07more pep8/pylint. all clean nowScott Moser
2013-03-07fix pep8 and pylintScott Moser
2013-03-07change default merge typeScott Moser
2013-03-07merge from trunkScott Moser
2013-03-07allow customization of apt-get command, add --force-unsafe-ioScott Moser
2013-03-07pep8 and pylint fixesScott Moser
2013-03-06Add some nice docs on what this is.Joshua Harlow
2013-03-06Make conf.d and the default merging use the new merging algos.Joshua Harlow
2013-03-06Continue working on merging code.Joshua Harlow