servenv: support for lameduck-period
Merge branch 'master' into monitoring
test env fix
Fixing typo in bson encoding of ZK stats.
Merge branch 'master' of github.com:youtube/vitess
servenv: Add comments to functions.
servenv: reduce default lameduck period

Since most tests don't set lameduck period, a high value will
most likely break them all. So, it's good to set this to something
very small.
Merge branch 'master' into monitoring
servenv: move some code around

Better reuse on import
Revert "test env fix"

This reverts commit 012f11c295a51429c553a7066f73204602b71b37.
Tear down the environment only once for querysevice_test.py.
Fixing mysql_binary_path.
queryservice: support qualified column names for update statements
Merge branch 'vtocc'
queryservice: log normal errors as warning

Since normal errors are common, it's better to log them
as warning.
queryservice: queryz fixes

Fix queryz (and querylogz) so long queries can wrap.
Also fix a coloring bug.
Add keyspace/shards resolution layer
Rewrite srv_topo_server_test to be table driven.
Removing a circular dependency.
Merge branch 'master' of github.com:youtube/vitess