* master: (22 commits)
Whoops
Better logging for broken paypal ipns.
Adding RSS Tracker for Windows to Goodies.
Refactoring socketio so real-time works around username restrictions.
Socket.IO v3 on the server too.
Switching to Socket.IO v3.
Haproxy splitting for socketio 3
Socket.io 3
Handling missing feed.
Only nb.local.com uses ports for websockets.
Adding GrazeTEN
Full node install on setup.
Updating toprc
Changing mongodb server.
Fixing toprc
Attempting to collect queries for 1% of requests by using DEBUG.
Fixing mongo install.
Recalculating premium expiration to take into account forced expirations after gifts.
Fixing never expire -> 1 year
Adding 1 year expire to admin.
...
* master:
Allow login from signup form.
Reducing celery prefetch to get more accurate queue sizes.
Removing RabbitMQ dependency. Moving to redis for task queuing.
Counting queue size for celery/redis.
Switching to redis to feed queuing. Also adding a weight for skipping feed fetches under high load.
Skipping feed resurrection.
Fixing last update problem that has been choking feed fetchers.
Fixing last update problem that has been choking feed fetchers.
Typo in feed pool drain.
Adding ability to wind down feed queue by faking requests.
Adding debug message about counting errors.
Conflicts:
fabfile.py
* master:
Fixing starred stories from not loading past the second page due to a missing flag reset.
Fixing user-found bug around tooltips continuing to show if the original dom element (and the reference to the tooltip) are destroyed too early, leaving a tooltip floating in the air.
Geometrically delaying the fetching of bad feeds, while they're still somewhat fresh.
Fixing error codes on statistics. Also fixing simple error on invalid feed.
Update media/js/newsblur/reader.js
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Adding build/ back to .gitignore.
Updating .gitignore.
Using dsa pem for retrieving rabbit update counts.
Preserving feed fetch error histories for 2 weeks.
Adding munin graph for known good feeds.
Turning down verbosity on feed tasking.
Adding known good feeds to munin to chart their progress.
Fixing headers overflow in Chrome.
Adding new feeds db column 'known_good', for forcing updates of feeds that were once good but are now throwing 500s.
Adding blogging OT press story.
