Merge branch 'master' into commonTlsConfig

Author: backjo

.gitignore

@@ -2,9 +2,9 @@
 *.test
 *.xml
 *.swp
-fmt.log
-import.log
-lint.log
+.fmt.log
+.import.log
+.lint.log
 cover.html
 .envrc
 .idea/
@@ -23,6 +23,8 @@ cmd/ingester/ingester
 cmd/ingester/ingester-*
 cmd/query/query
 cmd/query/query-*
+cmd/tracegen/tracegen
+cmd/tracegen/tracegen-*
 cmd/docs/*.md
 cmd/docs/*.rst
 cmd/docs/*.1

ADOPTERS.md

@@ -15,6 +15,7 @@
 * [SeatGeek](https://seatgeek.com/)
 * [SpotHero](https://spothero.com/)
 * [Stagemonitor](https://www.stagemonitor.org/)
+* [Tencent](https://www.tencent.com/en-us/index.html)
 * [Ticketmaster](https://www.ticketmaster.com)
   * Case study: [Ticketmaster Traces 100 Million Transactions per Day with Jaeger](https://medium.com/jaegertracing/ticketmaster-traces-100-million-transactions-per-day-with-jaeger-38ec6cf599f0)
   * Talk: [Deploy, Scale and Extend Jaeger](https://www.youtube.com/watch?v=JloanFIc-ms)

CHANGELOG.md

@@ -58,8 +58,7 @@ Changes by Version
         If you don't run the migration script, nothing will break, the system will used the old table 
         `operation_names` and set empty `spanKind` in the response.  
         Steps to get the updated functionality:
-        1.  You will need to run below command on the host you can use `cqlsh` to connect the the cassandra contact
-         point
+        1.  You will need to run the command below on the host where you can use `cqlsh` to connect to Cassandra:
             ```
             KEYSPACE=jaeger_v1 CQL_CMD='cqlsh host 9042 -u test_user -p test_password --request-timeout=3000' 
             bash ./v002tov003.sh

CODEOWNERS

@@ -1,3 +1,2 @@
 
-* @black-adder @jpkrohling @objectiser @pavolloffay @tiffon @vprithvi @yurishkuro 
-
+* @jaegertracing/jaeger-maintainers