← Back to branch summary

~landscape/graphite/trunk

~landscape/graphite/trunk

Viewing all changes in revision 408.

Committer: Andreas Hasenack
Date: 2011-08-23 19:00:47 UTC
mfrom: (395.1.145 graphite)
Revision ID: andreas@canonical.com-20110823190047-uhvlyif3s1aq999h

Merged with upstream-trunk, resolving conflicts (actually, taking the upstream version of the conflicted file).

files added:
carbon/bin/carbon-client.py

carbon/lib/carbon/client.py

carbon/lib/carbon/management.py

carbon/lib/carbon/routers.py

carbon/lib/carbon/state.py

docs/functions.rst

docs/terminology.rst

requirements.txt

whisper/bin/whisper-set-aggregation-method.py

files removed:
carbon/lib/carbon/aggregator/client.py

carbon/lib/carbon/relay.py

files renamed:
carbon/lib/carbon/rules.py => carbon/lib/carbon/relayrules.py

files modified:
carbon/conf/aggregation-rules.conf.example

carbon/conf/carbon.conf.example

carbon/lib/carbon/aggregator/buffers.py

carbon/lib/carbon/aggregator/receiver.py

carbon/lib/carbon/amqp_listener.py

carbon/lib/carbon/cache.py

carbon/lib/carbon/conf.py

carbon/lib/carbon/events.py

carbon/lib/carbon/hashing.py

carbon/lib/carbon/instrumentation.py

carbon/lib/carbon/log.py

carbon/lib/carbon/protocols.py

carbon/lib/carbon/service.py

carbon/lib/carbon/storage.py

carbon/lib/carbon/util.py

carbon/lib/carbon/writer.py

carbon/setup.py

conf/dashboard.conf.example

docs/carbon-daemons.rst

docs/conf.py

docs/config-carbon.rst

docs/index.rst

docs/tools.rst

docs/url-api.rst

setup.py

webapp/content/js/composer_widgets.js

webapp/content/js/dashboard.js

webapp/graphite/dashboard/views.py

webapp/graphite/metrics/urls.py

webapp/graphite/metrics/views.py

webapp/graphite/render/datalib.py

webapp/graphite/render/functions.py

webapp/graphite/render/glyph.py

webapp/graphite/render/views.py

webapp/graphite/storage.py

whisper/bin/whisper-create.py

whisper/bin/whisper-fetch.py

whisper/bin/whisper-resize.py

whisper/bin/whisper-update.py

whisper/setup.py

whisper/whisper.py

Show diffs side-by-side

added added

removed removed

carbon/bin/carbon-client.py

carbon/conf/aggregation-rules.conf.example

carbon/conf/carbon.conf.example

carbon/lib/carbon/aggregator/buffers.py

carbon/lib/carbon/aggregator/client.py

carbon/lib/carbon/aggregator/receiver.py

carbon/lib/carbon/amqp_listener.py

carbon/lib/carbon/cache.py

carbon/lib/carbon/client.py

carbon/lib/carbon/conf.py

carbon/lib/carbon/events.py

carbon/lib/carbon/hashing.py

carbon/lib/carbon/instrumentation.py

carbon/lib/carbon/log.py

carbon/lib/carbon/management.py

carbon/lib/carbon/protocols.py

carbon/lib/carbon/relay.py

carbon/lib/carbon/relayrules.py

carbon/lib/carbon/routers.py

carbon/lib/carbon/service.py

carbon/lib/carbon/state.py

carbon/lib/carbon/storage.py

carbon/lib/carbon/util.py

carbon/lib/carbon/writer.py

carbon/setup.py

conf/dashboard.conf.example

docs/carbon-daemons.rst

docs/config-carbon.rst

docs/functions.rst

docs/terminology.rst

docs/url-api.rst

requirements.txt

webapp/content/js/composer_widgets.js

webapp/content/js/dashboard.js

webapp/graphite/dashboard/views.py

webapp/graphite/metrics/urls.py

webapp/graphite/metrics/views.py

webapp/graphite/render/datalib.py

webapp/graphite/render/functions.py

webapp/graphite/render/glyph.py

webapp/graphite/render/views.py

webapp/graphite/storage.py

whisper/bin/whisper-create.py

whisper/bin/whisper-fetch.py

whisper/bin/whisper-resize.py

whisper/bin/whisper-set-aggregation-method.py

whisper/bin/whisper-update.py

whisper/setup.py

whisper/whisper.py

Older »