summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-09tools: fix [some] shell quoting problemsScott Moser
2013-04-09tools: fix [some] shell quoting problemsScott Moser
2013-04-03add merge debug toolScott Moser
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-04-02Fix the default string used for merging.Joshua Harlow
2013-03-26compatibility fixes for Fedora and RHELGreg Padgett
2013-03-26handle errors in cc_reizefs betterScott Moser
2013-03-26cloud-init-nonet.conf: handle case where sleep diedScott Moser
2013-03-26fix brpm and bddeb by knowing about 'python-requests'Scott Moser
2013-03-20use 'requests' rather than urllib2.Scott 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-12refactor get_mount_info and add testsBlair Zajac
2013-03-12skip unit test due to LP: #1124384Scott Moser
2013-03-10util.parse_mount_info(): add unit tests.Blair Zajac
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-08Enable the merging.txt to be in .rst format for public viewingJoshua Harlow
2013-03-07support different and user-suppliable merging algorithms for cloud-configScott Moser
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-07pep8Scott Moser
2013-03-07fix a pylint complaint in test_handler_growpartScott Moser
2013-03-07allow customization of apt-get command, add --force-unsafe-ioScott Moser
2013-03-07pep8 and pylint fixesScott Moser
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 13:44:07 +0000