summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Import timeutils.is_soon from keystoneclientJulien Danjou2013-01-232-0/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This is a function defined as will_expire_soon at least twice in python-keystoneclient, and it's actually quite handy. There is a comment on that code about moving to timeutils, and it actually sounds like a good idea since I'm likely to use it in Ceilometer, so here it is. Change-Id: Idf208ce9e7ce9048a38d98212b7f730c6b7c8288 Signed-off-by: Julien Danjou <julien@danjou.info>
* / | Allow update.py to copy toolsJoe Gordon2013-01-232-0/+14
|/ / | | | | | | | | | | With first tool: flakes.py Change-Id: Ie7880927c74ceff174b3b0d2730c499790650921
* | Merge "Enable ZeroMQ tests"Jenkins2013-01-222-1/+1
|\ \
| * | Enable ZeroMQ testsEric Windisch2013-01-192-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZeroMQ tests were not enabled as the required library was not installed to the tox environment. This change will re-enable zeromq messaging tests for both local development and jenkins. Change-Id: Icffbffcb2b83c74f06075d93e1397c5c9b511a67
* | | Merge "Move logging config options into the log module"Jenkins2013-01-214-142/+123
|\ \ \
| * | | Move logging config options into the log moduleMark McLoughlin2013-01-214-142/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We learned a lesson in Nova - it's best to declare and use config options within a single module if possible. Globally declared and use config options grow like weeds and it becomes harder to find out if, where and how individual options are used. Strangely, in cfg itself, we randomly declare a bunch of logging options which are only used within the openstack.common.log module - let's move the options there and remove the CommonConfigOpts class before they become part of the API we commit to when oslo-config is released. A minor detail in the patch - the logfile and logdir options are already deprecated in favour of log_file and log_dir, but we never got around to removing all other traces of the deprecated options. Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6
* | | | Merge "Use revno and git sha for pre-release versioning."Jenkins2013-01-213-12/+41
|\ \ \ \
| * | | | Use revno and git sha for pre-release versioning.Monty Taylor2013-01-183-12/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In discussions with ttx and zul, it became clear that the git describe info for our intra-release case wasn't providing any value and was providing confusion. Additionally, plain git sha's are not providing enough info. So, the scheme settled on that breaks the least amount of things and yet still reduces complexity is: if pre-version: # server projects try: use current tag except: use pre-version+revcount+gitsha else: use git describe | s/-/./ Additionally, we'll use a as a prefix for the revcount, b as the prefix for the milestone portion of a milestone tag, and rc as the prefix for rc's, so that for our releases, python version sorting works as expected. Change-Id: I6f0fe029d225afa8f435bc83216fc144c2402ae0
* | | | | Merge "Add env var version override for packagers."Jenkins2013-01-211-0/+3
|\| | | | | |/ / / |/| | |
| * | | Add env var version override for packagers.Monty Taylor2013-01-181-0/+3
| | |/ | |/| | | | | | | | | | | | | Fixes bug 1100805. Change-Id: I8c8ba8610ed2d9093e188c1412e9689314560015
* / | Remove unused etc/openstack-common.conf.testMark McLoughlin2013-01-211-31/+0
|/ / | | | | | | | | | | This is unused since commit e0f57e92 removed the extensions module. Change-Id: Ia24d01c42fc9fb2e12eea697d217b30d7d6b2a51
* | Merge "Require greenlet 0.3.2 (or later)"Jenkins2013-01-181-1/+1
|\ \
| * | Require greenlet 0.3.2 (or later)Zane Bitter2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 0.3.2 resolves a bug that allowed generic "except Exception:" clauses to catch GreenletExit exceptions. bug 1097203 Change-Id: Iecf36df36e5eefa45c70fae69c966bcd1f723c8f Signed-off-by: Zane Bitter <zbitter@redhat.com>
* | | Merge "Fixes import order errors"Jenkins2013-01-188-9/+9
|\ \ \
| * | | Fixes import order errorsZhongyue Luo2013-01-188-9/+9
| | |/ | |/| | | | | | | Change-Id: I3e35230dd2d96ab9f5a8c11b9ec1cd8d2d00e347
* | | trivial pep whitespace fixSteven Hardy2013-01-181-1/+1
| |/ |/| | | | | | | | | | | | | Fix multiple spaces after keyword pep8 error, causes our pep8 gate to fail (pep8 1.3.4) Change-Id: I67ab86ce17a1a91f8dab61efb18b83b22d2e1488 Signed-off-by: Steven Hardy <shardy@redhat.com>
* | Merge "Remove write_requirements"Jenkins2013-01-181-9/+0
|\ \
| * | Remove write_requirementsMonty Taylor2013-01-161-9/+0
| | | | | | | | | | | | | | | | | | | | | Everyone hated this, so we decided to get rid of it at the last summit. Actually, come to think of it, I think we decied to get rid of it in San Fran. Change-Id: I7d93af1eb98a37ff018730669731a7ee22516279
* | | Merge "ThreadGroup remove unused name parameters"Jenkins2013-01-182-7/+5
|\ \ \ | |_|/ |/| |
| * | ThreadGroup remove unused name parametersSteven Hardy2013-01-162-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thread/ThreadGroup constructors take a name parameter which is never used, so we can simplify things a bit by removing it. If anything is referencing the internal self.name it should be using its own name->threadgroup mapping (e.g via a dict or similar container class) Change-Id: I6877a2fcee60ce9fc087d38aa492d7c9d50ce97e Signed-off-by: Steven Hardy <shardy@redhat.com>
* | | Merge "use regexp to parse the mailmap"Jenkins2013-01-171-5/+6
|\ \ \ | |_|/ |/| |
| * | use regexp to parse the mailmapIonuț Arțăriși2013-01-161-5/+6
| | | | | | | | | | | | | | | | | | | | | this also makes parse_mailmap() work with the swift .mailmap and should be more readable Change-Id: I3abb2a18d655e507bee5f621ebc64421d943cf0b
* | | Stop using no longer valid -E option for pipJohannes Erdfelt2013-01-161-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1100403 Version 1.1 of pip dropped the -E option. It's not necessary anyway since running pip in a correctly setup virtualenv will automatically do the right thing. Change-Id: Ifec9f27b8dc169d594125a0808126abe77ed42e7
* | | Fixes an import order nitZhongyue Luo2013-01-161-1/+1
| |/ |/| | | | | Change-Id: Ic47deb67c5dad123c8937e3468d798eefe045280
* | Merge "Make tox run doctests"Jenkins2013-01-153-9/+11
|\ \
| * | Make tox run doctestsMark McLoughlin2013-01-153-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'nosetests --with-doctests' to run any doctests found. We currently only use doctests in a handful of places, but we may as well run them to ensure they work. Make the cfg doctests avoid using the global CONF since we would need to reset its state between each doctest. Fix the cliutils doctests to actually pass. Use 'nosetests --exclude-dir=tests/testmods' to avoid loading the modules from this dir while discovering doctests. The cfg unit tests rely on these modules not having been previously loaded. Change-Id: I19ad70767fa5c8352b994dc963b5d3a7c9d9eb95
* | | Merge "Allow rpc drivers to always be imported"Jenkins2013-01-152-10/+20
|\| |
| * | Allow rpc drivers to always be importedMark McLoughlin2013-01-152-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qpid and zmq drivers current can't be import unless their respective libraries are installed and neither are currently listed in test-requires. This prevents us from being able to use nosetests --with-doctests because the import failure is seen as a test failure. Fix this issue by making the import always succeed and deferring failure until the module's APIs are actually used. This will also help Nova's sample config file generation since it will allow the generate-sample tool discover config options for these drivers even when the messaging libraries aren't installed. Change-Id: I30087fd33eef41d50d1a374cb5694dc15c43d1da
* | | Merge "Rework zmq setup and cleanup"Jenkins2013-01-152-27/+18
|\| |
| * | Rework zmq setup and cleanupMark McLoughlin2013-01-152-27/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register config options at import time and remove the register_opts() function. It seems this isn't being used. Add accessor methods for ZMQ_CTXT and matchmaker so that they are lazily created rather than created at import time. Remove the rpc_zmq_matchmaker override in the tests since MatchMakerLocalhost is the default anyway. We were setting it with an incorrect value, but only after the matchmaker had already been created. Change-Id: I2520252c64d70e4c4903e34d07952fed43e70ebe
* | Merge "Fix zmq socket.close() with eventlet 0.9.17"Jenkins2013-01-151-3/+7
|\ \
| * | Fix zmq socket.close() with eventlet 0.9.17Eric Windisch2013-01-131-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug/change in eventlet 0.9.17 blocks the kwargs from close() from passing through to pyzmq. As this code was only explicitly passing defaults, no argument is necessary. This addresses file descriptor leaks reported in bug 1099185. This bug does not affect installations with eventlet<=0.9.16 The code will now log an error if a socket cannot be closed. Change-Id: Id438dab9744042328b7fac44693d02e116d8c1d9
* | | Merge "Don't include versioninfo in manifest."Jenkins2013-01-151-1/+0
|\ \ \ | |_|/ |/| |
| * | Don't include versioninfo in manifest.Monty Taylor2013-01-141-1/+0
| |/ | | | | | | | | | | | | We don't produce versioninfo files anymore, so don't try to include them in the MANIFEST.in. Change-Id: I00d8a61361cba73528a1ae780538a80ed1da2361
* | Merge "Add missing parameter to impl_fake notify function."Jenkins2013-01-151-1/+1
|\ \
| * | Add missing parameter to impl_fake notify function.Gary Kotton2013-01-141-1/+1
| |/ | | | | | | | | | | The envelope was missing. Change-Id: I3ab8f573e6c5020bd564ad78de29e6c285695f2c
* | Merge "Implement importutils.try_import."Jenkins2013-01-154-3/+18
|\ \
| * | Implement importutils.try_import.Dan Prince2013-01-144-3/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new (simple) importutils.try_import function which can return a module name or a default (by default this is None). This should help clean up some of our try: import foo except... blocks in modules. This commit also drops the dependency on python-extras which is no longer needed. Fixes LP Bug #1099501. Change-Id: I8591f79983bdad67a50d1aaae6dce8428dfce084
* | Merge "reusable ZmqProxy service initialization"Jenkins2013-01-153-48/+35
|\ \
| * | reusable ZmqProxy service initializationEric Windisch2013-01-133-48/+35
| |/ | | | | | | | | | | | | | | | | | | | | Move near-identical proxy setup code from oslo-zmq-receiver and test_zmq into ZmqProxy's consume_in_thread method Provides code reuse and simplifies the tests and receiver binary. Change-Id: I1324eacfa2a456599d5fd462b6476ddf659e95c4
* | Merge "call() to accept serialize and force_envelope"Jenkins2013-01-151-3/+6
|\ \ | |/ |/|
| * call() to accept serialize and force_envelopeEric Windisch2013-01-101-3/+6
| | | | | | | | | | | | | | | | | | | | The serialize and force_envelope options were being stripped from call(). Now, when call() is invoked, these options are passed and respected. Change-Id: I69355606b06ab2ec87765fe6ddba7baaa68e5754
* | Merge "Verbose should not enable debug level logging"Jenkins2013-01-133-5/+15
|\ \
| * | Verbose should not enable debug level loggingDavanum Srinivas2013-01-123-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP #989269 Currently setting --verbose in will still allow DEBUG level message to be logged to python logger object. we need to check for --debug first (set DEBUG level), then --verbose (set INFO level) and if neither is set then set default to WARNING DocImpact Change-Id: Ic9e3cb5979b2d7283552ad3a461870373f45a239
* | | Merge "Upgrade WebOb to 1.2.3"Jenkins2013-01-121-1/+1
|\ \ \
| * | | Upgrade WebOb to 1.2.3Doug Hellmann2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of WebOb being used in OpenStack was more than 1 year old. This change updates to the latest stable release. Upgrading WebOb resolves a version conflict between OpenStack and Pecan, the web framework used by the Ceilometer team for version 2 of the ceilometer API. Refer to http://docs.webob.org/en/latest/news.html for the list of changes between 1.0.8 and 1.2.3. bug 1092227 Change-Id: I2c8e95ecc3b69b40fd9f8d2f801e75c17b07ed59 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
* | | | Merge "zmq-receiver msg forwarding in greenthreads"Jenkins2013-01-121-20/+48
|\ \ \ \
| * | | | zmq-receiver msg forwarding in greenthreadsEric Windisch2013-01-101-20/+48
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because PUSH sockets can block and there may not be PULL consumers, the oslo-zmq-receiver process may stall in certain senarios. Improves error handling in ZmqProxy. This addresses bug 1097856. Additionally, this bug seems to improve (but not necessarily fix) the behavior reported in bug 1065532. Change-Id: I6df6035a6676c5bcdddaec7a332ac77e621ba9f3
* | | | Merge "Improve millisecond logging"Jenkins2013-01-121-3/+3
|\ \ \ \
| * | | | Improve millisecond loggingJoe Gordon2013-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always display 3 digits for milliseconds (appends 0s) Change-Id: I3f1461839258be0723e2d3616ec225a830d13029
generated by cgit (git 2.34.1) at 2025-09-28 02:02:52 +0000