← Back to branch summary

~landscape/graphite/staging

~landscape/graphite/staging

Viewing all changes in revision 407.

Committer: Andreas Hasenack
Date: 2012-02-04 18:10:49 UTC
mfrom: (397.1.19 trunk)
Revision ID: andreas@canonical.com-20120204181049-0gnknem3jsb3suoz

Tags: 12.01.2, 12.03.1, 12.03.2, 12.04.1, 12.05, 12.09, 12.11, 13.01, 13.02, 13.03, 13.04, 13.05, 13.06, 13.07, 13.08

Merging from trunk for staging deployment of 12.01.2

files added:
carbon/conf/storage-aggregation.conf.example

docs/whisper.rst

files removed:
storage

storage/lists

storage/log

storage/log/carbon-cache

storage/log/carbon-relay

storage/log/webapp

storage/rrd

storage/whisper

files modified:
.bzrignore

carbon/conf/carbon.conf.example

carbon/conf/storage-schemas.conf.example

carbon/lib/carbon/aggregator/receiver.py

carbon/lib/carbon/amqp_publisher.py

carbon/lib/carbon/client.py

carbon/lib/carbon/conf.py

carbon/lib/carbon/log.py

carbon/lib/carbon/writer.py

check-dependencies.py

docs/carbon-daemons.rst

docs/config-carbon.rst

docs/index.rst

docs/tools.rst

docs/url-api.rst

docs/who-is-using.rst

requirements.txt

webapp/content/js/browser.js

webapp/content/js/composer_widgets.js

webapp/content/js/dashboard.js

webapp/content/js/jquery.graphite.js

webapp/graphite/browser/views.py

webapp/graphite/events/views.py

webapp/graphite/graphlot/views.py

webapp/graphite/render/datalib.py

webapp/graphite/render/evaluator.py

webapp/graphite/render/functions.py

webapp/graphite/render/glyph.py

webapp/graphite/render/grammar.py

webapp/graphite/render/hashing.py

webapp/graphite/render/views.py

webapp/graphite/storage.py

webapp/graphite/templates/events.html

webapp/graphite/templates/graphlot.html

Show diffs side-by-side

added added

removed removed

carbon/conf/carbon.conf.example

carbon/conf/storage-aggregation.conf.example

carbon/conf/storage-schemas.conf.example

carbon/lib/carbon/aggregator/receiver.py

carbon/lib/carbon/amqp_publisher.py

carbon/lib/carbon/client.py

carbon/lib/carbon/conf.py

carbon/lib/carbon/log.py

carbon/lib/carbon/writer.py

check-dependencies.py

docs/carbon-daemons.rst

docs/config-carbon.rst

docs/url-api.rst

docs/whisper.rst

docs/who-is-using.rst

requirements.txt

storage/log/carbon-cache/

storage/log/carbon-relay/

storage/log/webapp/

storage/whisper/

webapp/content/js/browser.js

webapp/content/js/composer_widgets.js

webapp/content/js/dashboard.js

webapp/content/js/jquery.graphite.js

webapp/graphite/browser/views.py

webapp/graphite/events/views.py

webapp/graphite/graphlot/views.py

webapp/graphite/render/datalib.py

webapp/graphite/render/evaluator.py

webapp/graphite/render/functions.py

webapp/graphite/render/glyph.py

webapp/graphite/render/grammar.py

webapp/graphite/render/hashing.py

webapp/graphite/render/views.py

webapp/graphite/storage.py

webapp/graphite/templates/events.html

webapp/graphite/templates/graphlot.html

Older »