* search:
Adding sub sort. Last fix and ready to deploy!
Removing minimum should match.
Further refining feed search. Upgrading to elasticsearch 1.7.1.
Fixed search indexing and querying for feeds. Finally!
Cleaning up feed search, but still broken.
Upgrading elasticsearch to 1.7.0, pyes to 0.99.5, and modern querying for stories. Needs a reindex. Still need to do feeds.
* master: (53 commits)
Logging checkpoints.
Adding clear overrides to story order and read filter (all/unread) in preferences, to match clear override buttons for story layout and story view.
Correcting discrepency of active subs when reading cache or having just recounted.
Adjust feed schedule duration. Looks like the bug has to do with exception feeds not being set correctly. Better fix that next.
Turning off refresh stale feeds. Maybe turn back on after the sub count finishes.
Showing user ip in social pages.
Showing user agent in social pages.
Blurblog pages now load a little quicker.
Postgres min log statement to 0.5s. Syncing haproxy debug with haproxy config.
Typo.
Easing off of forcing updates when not counted in redis.
Counting feed subscribers needs less logging.
Adding cleanup sub counts for users on cleanup. Also enabling redis sub store for all feeds.
Adding random factor in to convert feeds over to redis cache.
Handling only case where a recount isn't actually necessary. Still need to add in automatic feed conversion to redis subscriber cache.
Fixing counts when taking into account muted feeds.
Taking active/unmuted feed sinto account when counting active subscribers.
Cleaning up pipeline.
Renaming counter and removing unused sql.
Separating counting feed subs and all user's feed subs.
...
* sub_count:
Adding user sub counts to redis, using new redis cache to count subscribers only when feed is entirely cached. Still need automatic conversion from postgres to redis sub counts.
