Better indentation of that file.
Small changes to match internal version.
Also copying Shard object content, not just create
Merge branch 'master' into resharding
Merge commit 'd3d4f2032a66a9fe91ba5b4ceca114b4690330f5'
Merge branch 'resharding'
Improved transaction error handling.
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'barnacle'
Merge branch 'master' into barnacle
Improved shard_conn retries.