summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add additional usage info on rpc_zmq_host flagEric Windisch2012-07-131-1/+2
| | | | | | | | Change-Id: I8f1f3b42de7253c993e2afa44ed1c0ad4dbbb74f
* | Merge "Restore register_opts on impl_zmq module load"Jenkins2012-07-161-0/+3
|\ \
| * | Restore register_opts on impl_zmq module loadEric Windisch2012-07-131-0/+3
| | | | | | | | | | | | Change-Id: I6acdf1445e1f03246476292b38d7c52a29934af1
* | | Merge "Minor pep8 cleanup in rpc."Jenkins2012-07-151-1/+1
|\ \ \
| * | | Minor pep8 cleanup in rpc.Andrew Bogott2012-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Removed a space, reordered an import. Change-Id: I418d1f7c6a5a3b8ef231c88b4ef28114ca0eb7cd
* | | | Merge "pep8 cleanup in the plugin code"Jenkins2012-07-152-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | pep8 cleanup in the plugin codeAndrew Bogott2012-07-082-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The nova hacking test turned up one alphabetization error that I missed previously. Also, our path-altering process caused one line to exceed 80 characters when copied into nova; that line is shorter now. Change-Id: Ia3acfc25ecc5ba388526766dae3ed03792e906e3
* | / Fix typo made in 372d11e990Eric Windisch2012-07-131-1/+1
| |/ |/| | | | | Change-Id: Iba232257595bb3084052a21a560f2f5551b5f1eb
* | Merge "Exclude .egg files from pep8 checks"Jenkins2012-07-131-1/+1
|\ \
| * | Exclude .egg files from pep8 checksEric Windisch2012-07-131-1/+1
| | | | | | | | | | | | Change-Id: I0f403cfa8edec3795f65cf270a9cb2ad0a05d4f5
* | | Fix import order of gettextutils in amqp.pyEric Windisch2012-07-131-1/+1
|/ / | | | | | | Change-Id: I53ca8308fb61c53274ca1e3d801f22c9b65d41aa
* | Add more rpc version docs.Russell Bryant2012-07-131-0/+39
| | | | | | | | | | | | | | This patch adds some additional documentation, including some examples, on making changes to versioned RPC APIs. Change-Id: I5f40b11e07538f36d0f1299f7e822b408bf8e96a
* | Merge "Add SKIP_GENERATE_AUTHORS option to setup.py"Jenkins2012-07-131-11/+15
|\ \
| * | Add SKIP_GENERATE_AUTHORS option to setup.pyDan Prince2012-07-131-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the generate_authors function in setup.py so that it will skip generation of the authors file if the SKIP_GENERATE_AUTHORS env variable is set. Authors doesn't currently take that long to generate but having the option to explicitly skip it (regardless of whether .git is there) seems like a good addition. Change-Id: Ie18064d2450cecc86f18d0b10e1ce473253d1a51
* | | Add SKIP_WRITE_GIT_CHANGELOG option to setup.pyDan Prince2012-07-131-6/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | Updates the write_git_changelog function in setup.py so that it will skip changelog generation if the SKIP_WRITE_GIT_CHANGELOG env variable is set. The motivation for this change is to speed up running sdist which gets executed at the begining of a tox run. Some projects (like Nova) can take between 10-20 seconds to generate a changelog in this fashion. Change-Id: I2e75060d303bc8fae784129e8e42f09922a8b09e
* | Fix missing gettextutils in several modules.Eric Windisch2012-07-1210-0/+11
| | | | | | | | | | | | Fixes bug 1021453. Change-Id: I05771a588746a0e43fec0078c5c7152dd9d33b9f
* | Merge "Fix line length for pep8 compliance after cloning into other projects"Jenkins2012-07-113-5/+11
|\ \
| * | Fix line length for pep8 compliance after cloning into other projectsDoug Hellmann2012-07-113-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few lines that are close to the length limit so they pass the PEP8 check under the common repository but fail the check after the code is cloned into another project such as ceilometer. These changes adjust the lines to give more space to allow the merge into the other projects to go ahead without breaking the pep8 gating tests. Change-Id: I33a05f5b51120114cc8ceffd0bf1b1ef462ed636 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | Merge "Add 'filedecoder' method to the jsonutils wrapper module."Jenkins2012-07-112-1/+10
|\ \ \
| * | | Add 'filedecoder' method to the jsonutils wrapper module.Tim Daly Jr2012-06-262-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1017765 After version 3.3.2, the anyjson library will throw a KeyError if filedecoder isn't present. The filedecoder is just like the decoder except it takes a file instead of a string, like json.load() instead of json.loads(). Change-Id: I7bd012a7b4afa9b1ec987c3e6393cc922b5dadff
* | | | Merge "cfg: Fix typo in documentation"Jenkins2012-07-111-2/+2
|\ \ \ \
| * | | | cfg: Fix typo in documentationVincent Untz2012-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with with -> with Change-Id: I7a524c024b05639ec7ab4d57b6a52f70a95d2235
* | | | | Merge "Fix import order."Jenkins2012-07-111-1/+1
|\ \ \ \ \
| * | | | | Fix import order.Russell Bryant2012-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import order in rpc.common. They must be alphabetical. Nova tests for this and caught it when i synced in the latest changes. Change-Id: I0dbd6b5004d754d0bd2d1861905db3405c64e3d4
* | | | | | Merge "Improve exception from importutils.import_class()."Jenkins2012-07-111-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Improve exception from importutils.import_class().Russell Bryant2012-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ImportError raised by import_class() attempted to tell you what the original error was by just doing str() on the original exception. Sometimes that's helpful, but sometimes a full traceback is needed. This patch includes a traceback for debugging purposes. Change-Id: I00cefb9ebf9d6a71ef491204d81765e30e7941f6
* | | | | | Merge "Add common plugin framework."Jenkins2012-07-117-0/+531
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add common plugin framework.Andrew Bogott2012-07-087-0/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For blueprint novaplugins. It turns out that most of the plugin framework applies equally well to other projects, so it's going into Nova via common so that other projects can pull it in with a minimum of fuss. Change-Id: Ia4455a8ca0b8c1c3e4b0b9647e8cacaf0a47c914
* | | | | | Rework the version consumer functionality.Monty Taylor2012-07-111-80/+123
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the version routines into a class for better structure. Added caching/memoization logic so that pkg_resources/git doesn't get called more than is necessary. Added periodic-based caching that will only cause the meta info refs to be checked at most once a day, to reduce network load for developers. (The information in the meta refs should really only change once a month, and this will only affect local developer workstation version reporting, so we should be fine here. Added a deferred version string class and function to allow for consuming of the version string but doing the calculation only when it is requested, based on test runs in glance. Change-Id: I6a436c8817f6904959727a76d876b807ec545ee9
* | | | | Fix Zmq so it doesn't rely on nova flagsJason Kölker2012-07-102-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Embeded newlines in logging makes me cry * String formatting uses parens not curly braces * Fix LP1023039 * Hard skip Zmq tests so jenkins passes. Someone will have to fix. Change-Id: I9b12ac47b02edf1d8dba7236550deb8ee33f5e07
* | | | | Merge "Switch common files to using jsonutils."Jenkins2012-07-1012-57/+59
|\ \ \ \ \
| * | | | | Switch common files to using jsonutils.Andrew Bogott2012-07-0312-57/+59
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For blueprint use-common-jsonutils Pretty much just a search and replace. Change-Id: I66f63e7b0ff82a37d8a6b9acef94f4e10a45bf90
* | | | | Merge "Enable sitepackages in tox."Jenkins2012-07-101-0/+1
|\ \ \ \ \
| * | | | | Enable sitepackages in tox.Joe Gordon2012-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables support for testing qpid (not available in pip) Change-Id: I36bc0398ed8e8377dfc8af10ae0981e117a3ec20
* | | | | | Merge "Fix up pre-versioning based on testing in glance."Jenkins2012-07-091-7/+15
|\ \ \ \ \ \
| * | | | | | Fix up pre-versioning based on testing in glance.Monty Taylor2012-07-091-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I137fee43509f079cb4b2def452cf23b6705cdda5
* | | | | | | Merge "Update strings like 'openstack.common.notifier.driver'."Jenkins2012-07-091-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update strings like 'openstack.common.notifier.driver'.Andrew Bogott2012-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was running into trouble with driver names that were generically named in common but need to point to specific objects within nova. Change-Id: Ie75761c73a855b067b1bcec651a1bb998deba9f4
* | | | | | | Add a new module for use in consuming versioninfo.Monty Taylor2012-07-081-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new tag-based versioning produces files that we can consume that tell us the versioning. That's all well and good, but what good is automatically generated versioning if there are no apis to consume it. This is derived from work to add those to nova and python-swiftclient. Change-Id: I91568ef28a9ed7e7365f66bca2294670df6e0c41
* | | | | | | Merge "Move get_context_from_function_and_args() to context.py"Jenkins2012-07-063-21/+18
|\ \ \ \ \ \ \
| * | | | | | | Move get_context_from_function_and_args() to context.pyAndrew Bogott2012-07-033-21/+18
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Word on the street is that exception.py may soon be deprecated, and context.py is a better place anyway. (Also removed an import of utils.py because /it/ imports exception.py.) Change-Id: I856fc6f4558cc01ddca350ee4cfd4684db47475b
* | | | | | | Merge "Add update.sh to avoid import conflicts"Jenkins2012-07-062-10/+17
|\ \ \ \ \ \ \
| * | | | | | | Add update.sh to avoid import conflictsMark McLoughlin2012-06-292-10/+17
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to fix #951197 The openstack nose plugin defines the openstack.common namespace which can result in exceptions when update.py attempts to import cfg. Avoid the issue by using an update.sh script which creates a no-site-packages virtualenv. Change-Id: I1ec5cf49361303b79306714122b860f6e4912215
* | | | | | | Fix up openstack-common build.Monty Taylor2012-07-026-20/+119
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ironically enough, even though the code to manage this is in openstack-common, openstack-common wasn't using it. This patch fixes doc generation, as well as setuptools-git integration and versioning. Change-Id: Ifb74ad539832d8cec4a536a96221eea8fb7527d2
* | | | | | Merge "Fix missing RPCException from raise"Jenkins2012-07-021-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix missing RPCException from raiseEric Windisch2012-06-281-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ia850b07d29459b760d24f9bffdd88e4176cb7faf
* | | | | Merge "Pass in stream as positional argument to StreamHandler."Jenkins2012-07-021-1/+3
|\ \ \ \ \
| * | | | | Pass in stream as positional argument to StreamHandler.Andrew Bogott2012-06-271-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Naming it works in python 2.7 but not in 2.6. Change-Id: I09cb0e707c428fcfb5d8e825d1acf17b00d84073
* | | | | Fix mailmap.Joe Gordon2012-06-281-1/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Mailmap was broken in 01cec1dcb1a0b8d6a0ba098f8e18ab3c0f7cabab Revert offending line only to get unit tests passing again. Change-Id: I33e8d5d3587b429d44ae60f34ca2f132ce233793
* | | | Split read_versioninfo into a method.Monty Taylor2012-06-261-4/+17
|/ / / | | | | | | | | | Change-Id: Iec1f9776b6e6fcccdc21b2e67754fff1da23458a