lp:~drawks/graphite/sb

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~graphite-dev/graphite/main

chrismd: Approve on 2011-10-04

Diff: 85 lines (+11/-4)

6 files modified

.bzrignore (+3/-0)
check-dependencies.py (+3/-1)
webapp/content/js/composer_widgets.js (+0/-2)
webapp/graphite/local_settings.py.example (+2/-0)
webapp/graphite/render/functions.py (+2/-1)
webapp/graphite/render/glyph.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

584. By Dave Rawks on 2011-09-27

Added LDAP_URI line to the example local config

583. By Dave Rawks on 2011-09-26

Corrected typo in exmple text for constantLine

582. By Dave Rawks on 2011-09-26

merged after rebase

581. By Dave Rawks on 2011-09-26

rebased

580. By Dave Rawks on 2011-09-26

modified aliasByNode to remove function cruft from metric names
added cyan as a named color

579. By Dave Rawks on 2011-09-08

Removed sumserireswithwildcards and averageserieswithwildcards from composer dialog

578. By Dave Rawks on 2011-09-08

minor update to the warning message in check_dependencies clarifying that mod_python doesn't prevent you from running via wsgi

577. By chrismd on 2011-09-25

fixed Bug #813810

576. By chrismd on 2011-09-25

merging in lp:~jerith/graphite/storage-aggregation

575. By chrismd on 2011-09-25

merging in lp:~lapsu/graphite/holtwinters