lp:~terrycojones/tickery/fluiddb-to-fluidinfo-798338

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:tickery

Terry Jones: Approve on 2011-06-16

Diff: 908 lines (+157/-155)

22 files modified

README (+8/-8)
bin/create-twitter-namespaces-and-tags.py (+4/-4)
doc/Makefile (+2/-2)
doc/conf.py (+1/-1)
doc/running.rst (+11/-11)
doc/todo.rst (+6/-6)
fabfile.py (+4/-3)
resources/upstart/www.tickery.net.conf (+1/-1)
tickery/ftwitter.py (+30/-30)
tickery/oidcache.py (+7/-6)
tickery/options.py (+4/-4)
tickery/query.py (+1/-1)
tickery/service.py (+10/-10)
tickery/utils.py (+5/-5)
tickery/www/about.py (+27/-27)
tickery/www/advanced.py (+29/-29)
tickery/www/banner.py (+1/-1)
tickery/www/defaults.py (+2/-2)
tickery/www/public/index.html (+1/-1)
tickery/www/results.py (+1/-1)
tickery/www/server.py (+1/-1)
tickery/www/tickerytab.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #798338: Replace FluidDB with Fluidinfo everywhere

Medium

Fix Committed

Link a bug report

Related blueprints

10. By Terry Jones on 2011-06-16

FluidDB -> Fluidinfo everywhere.

9. By Terry Jones on 2011-06-16

Trivial update to .bzrignore

8. By Terry Jones on 2011-06-16

Copied requirements.txt, resources, fabfile.py out of tickery-virtualenvify-784701.

7. By Terry Jones on 2011-06-16

Merged changes -r 2..3 from tickery-virtualenvify-784701

6. By Terry Jones on 2011-06-16

Merged rm-trailing-whitespace-797375

5. By Terry Jones on 2011-06-16

Merged fix-pep8-798273.

4. By Terry Jones on 2011-06-16

Merged from fix-errback-arg-794347.

3. By Terry Jones on 2011-06-16

Merged rm-pyflakes-errors-797404

2. By Terry Jones on 2011-06-16

Merged rm-trailing-whitespace-797375

1. By Fluidinfo developers - ntoll <email address hidden> on 2010-07-20

Initial commit of open-sourced version into git (from source originally managed by bzr)