summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove upper bound on six dependency version2013.1.4Eoghan Glynn2013-10-171-2/+2
* Merge "Fixes two typos in this measurements.rst" into stable/grizzlyJenkins2013-10-151-2/+2
|\
| * Fixes two typos in this measurements.rstHaomeng, Wang2013-10-141-2/+2
* | Merge "Don't publish samples if resource_id in missing" into stable/grizzlyJenkins2013-10-152-5/+31
|\ \
| * | Don't publish samples if resource_id in missingMehdi Abaakouk2013-10-142-5/+31
| |/
* | Merge "Fix get_resources timestamp ordering for SQLAlchemy" into stable/grizzlyJenkins2013-10-153-18/+116
|\ \
| * | Fix get_resources timestamp ordering for SQLAlchemyThomas Maddox2013-10-143-18/+116
| |/
* | keystone client changes in AuthProtocol made our test cases failingTong Li2013-10-142-4/+9
|/
* Consume notification from the default queueJulien Danjou2013-09-192-1/+14
* Catch exceptions from nova client in poll_and_publishHarri Hämäläinen2013-09-163-2/+26
* Merge "Fix regressions in unit test merge" into stable/grizzlyJenkins2013-09-121-4/+4
|\
| * Fix regressions in unit test mergeDirk Mueller2013-09-021-4/+4
* | Added upper version boundry for sixLianhao Lu2013-09-031-0/+1
|/
* Bump stable/grizzly next version to 2013.1.4Alan Pevec2013-08-081-1/+1
* Merge "Fix return error when resource can't be found" into stable/grizzly2013.1.3Jenkins2013-07-312-3/+57
|\
| * Fix return error when resource can't be foundFei Long Wang2013-07-312-3/+57
* | Merge "Allow to specify the endpoint type to use" into stable/grizzlyJenkins2013-07-314-1/+11
|\ \
| * | Allow to specify the endpoint type to useJulien Danjou2013-07-314-1/+11
| |/
* | Merge "doc: be more explicit about network counters" into stable/grizzlyJenkins2013-07-311-5/+4
|\ \
| * | doc: be more explicit about network countersJulien Danjou2013-07-311-5/+4
| |/
* | Merge "Use correct hostname to get instances." into stable/grizzlyJenkins2013-07-311-1/+1
|\ \
| * | Use correct hostname to get instances.Brooklyn Chen2013-07-311-1/+1
| |/
* | Merge "Fix the argument of UnknownArgument exception" into stable/grizzlyJenkins2013-07-311-2/+1
|\ \
| * | Fix the argument of UnknownArgument exceptionMehdi Abaakouk2013-07-311-2/+1
| |/
* | Merge "Add index for db.meter by descending timestamp" into stable/grizzlyJenkins2013-07-311-0/+2
|\ \
| * | Add index for db.meter by descending timestampterriyu2013-07-311-0/+2
| |/
* | Merge "Lose weight for Ceilometer log in verbose mode" into stable/grizzlyJenkins2013-07-312-6/+6
|\ \
| * | Lose weight for Ceilometer log in verbose modeGuangyu Suo2013-07-312-6/+6
| |/
* | fix resource_metadata failure missing image dataJohn Tran2013-07-312-50/+117
* | add metadata to nova_client resultsJohn Tran2013-07-315-43/+131
|/
* Allow use of local conductorSam Morrison2013-07-291-2/+2
* Bump stable/grizzly next version to 2013.1.3Adam Gandelman2013-06-061-1/+1
* sql: fix 003 downgrade2013.1.2Julien Danjou2013-05-311-0/+1
* Merge "Don't use pecan to configure logging" into stable/grizzlyJenkins2013-05-313-48/+1
|\
| * Don't use pecan to configure loggingMark McLoughlin2013-05-313-48/+1
* | Merge "ImagePollster record duplicate counter during one poll" into stable/gr...Jenkins2013-05-312-7/+59
|\ \
| * | ImagePollster record duplicate counter during one pollxingzhou2013-05-312-7/+59
| |/
* | Merge "vnics: don't presume existence of filterref/filter" into stable/grizzlyJenkins2013-05-314-14/+72
|\ \
| * | vnics: don't presume existence of filterref/filterSwann Croiset2013-05-314-14/+72
| |/
* | Merge "fix compute units in measurement doc" into stable/grizzlyJenkins2013-05-311-3/+3
|\ \
| * | fix compute units in measurement docGordon Chung2013-05-311-3/+3
| |/
* | Merge "Document HBase configuration" into stable/grizzlyJenkins2013-05-311-0/+65
|\ \
| * | Document HBase configurationShengjie Min2013-05-311-0/+65
| |/
* | Merge "Restore default interval" into stable/grizzlyJenkins2013-05-311-1/+1
|\ \
| * | Restore default intervalNick Barcet2013-05-311-1/+1
| |/
* | Merge "Document keystone_authtoken section" into stable/grizzlyJenkins2013-05-311-0/+26
|\ \
| * | Document keystone_authtoken sectionFei Long Wang2013-05-311-0/+26
| |/
* | fix the broken ceilometer.conf.sample linkShengjie Min2013-05-311-1/+2
|/
* doc: fix hyphens instead of underscores for 'os*' conf optionsCedric Soulas2013-05-281-5/+5
* Pin SQLAlchemy to 0.7.xDirk Mueller2013-05-271-1/+1