slack merge upstream 2017 08 21

[demmer]

Overview

This branch contains an updated slack fork for vitess in a way that syncs us back with upstream/master and then applies three slack-specific patches that we still need to run with.

This PR is based off the slack-new-master branch. Once approved, I'll merge this PR into that branch, rename our existing master branch toslack-old-master-20170821, and force-push the merged slack-new-master as our new master branch.

Details

To prepare the branch I looked through our history and found the earliest merge point.

From that I created two new tags:

• slack-vitess-081417r0-base (7b7c6e6): the base of our current fork, including previous slack-specific history
• slack-vitess-081417r0-upstream (a5a7253): upstream commit that we last synced.

The content of these two tags / commits are equivalent.

I then created a slack-new-master branch off of the latest upstream/master (8188623), and I created a tag with slack-vitess-082117r0-upstream at this merge point.

Then I went through all the slack-specific commits since our latest sync:

[SFO-M-MDEMMER01] -> git log --oneline --no-merges slack-vitess-081417r0-base..origin/master
b089a6f Refresh MySQL config after a backup
afe78be `insert ignore` hack for vindex lookup to be updated (#30)
ae637b5 Pin Travis test config to Ubuntu Precise.
bdad4c3 Fix for travis ci
4fcdc0a Fix mysql server test
6ce58f1 Allow VTDATAROOT to be configurable
66b1ee7 change autocommit default for all mysql sessions to true
f0004cf Revert "Merge pull request #22 from tinyspeck/hz_vitess"
0c24fdd ~ revert `vendor/vendor.json` changes
a628346 make grpc max message size options apply to the client as well
e7627dd fix test
628e6de fixing `disallow outside transactions` of select for update
fb0850c Testing 'Sanity healthcheck connections' commit https://github.com/youtube/vitess/pull/3004
80eac90 add temporary hack to ignore vindex insert duplicate errors
8eccb48 redact out the /txlogz endpoint completely
bfac6ab make the tablet identification added to errors more concise

Of these I cherry-picked three into this branch:

8eccb48 redact out the /txlogz endpoint completely
e07891a make grpc max message size options apply to the client as well
afe78be `insert ignore` hack for vindex lookup to be updated (#30)

For e07891a, I actually cherry-picked from my updated upstream branch to fix conflicts.
For afe78be there were a number of conflicts that I reconciled manually.

[rafael]

LGTM