Skip to content

Commit 43fb5ca

Browse files
swetharepakulajvshahid
authored andcommitted
bump cf-tcp-router route-emitter routing-api go-statsd-client etcd gorm inflection rata
Submodule src/code.cloudfoundry.org/cf-tcp-router 00000000...3e1383da (new submodule) Submodule src/code.cloudfoundry.org/route-emitter 85f8a746..09ad9751: > the happy path integration test is passing > WIP: Add tcp-emitter under tcp dir > wip: merge tcp route-emitter's main test suite into the http emitter Submodule src/code.cloudfoundry.org/routing-api 38b697b5..9760a87a: > Merge pull request #12 from alex-slynko/patch-1 > Update README > Update error msg for multiple router group name > Router groups with the same name should fail on startup > Add higher timeout for routing api server to come up > Add unique index on router group name > Update api_docs.md > Update NOTICE > added modification tag as valid field for create tcp route; updated ttl in examples > Merge pull request #11 from abbyachau/patch-1 > Update locket dependency > Remove cflager > Make routing-api compile on go1.6 > Update the token error into generalised error > Make errcheck and go vet pass with Go 1.7 > Update api_docs.md > Update api_docs.md > Update api_docs.md > Update api_docs.md > Update api_docs.md > Update api_docs.md > Update README.md > Update README.md > Handle error from consulRunner.Reset > Remove eventually block for Delete event > Increase ttl of route in sql test > Fix flaky tests > Fix postgres migration > Routing API client shouldn't send null as empty response body > Validate that etcd peer port is also available to bind > Refactor tests > Refactor: Handle errors better in SQL facing packages > Does not stop SQL migration until redeploy > Kill etcd with fire > Split lock acquire and lock release > Remove duplicate API docs > Longer timeout to ensure routing-api is runing in test setup > Make tests robust y increasing timeout > Do not close golang listener if it does not exist > Make etcd cluster restart more robust to CI failures > Rewrite test to check for expired routes > Making unit tests more resilient > Add postgres support to test > Increase timeout > Add support for postgres > Update tcp route table name > Fix flaky tests > Wait longer when opening port in migration event test > Fix flaky test > Fix ci flaky tests > Fix Routing API flaky tests > Fix merge error > Migration stops listening to ETCD events once lock is acquired > Added ETCD -> SQL migration > Added SQL migration framework and V0 init migration > Moved seeding of router groups to after the lock is acquired > Refactored DB package > Emit ExpireEvent when routes TTL expires > Remove precision on expires_at > Allow null value for expires_at for http and tcp routes > Change ExpiresAt field to use microsecond precision > Combined SQL db prune route tests > Remove commented out code > Ensure a single goroutine is in flight per route type > Refactor DB initialization in unit tests > Only use a single database > Emit expired events when using MySQL > Add database level functionality to save, list, and delete routes > Add events on MySQL for TCP routes > Refactor WatchRouteChanges interface > Add TCP Events API tests > Only log on actual error when sending metrics > Move event streaming API tests into api_test file > Implement modification tags for SQL > Add MatchTcpRoute matcher > Implement TCP endpoints using MySQL > Update the order of events > Correct StartCheck value for Routing API > Longer timeout to fix flaky tests > fix api test by adding higher timeout > Added retry logic to routing_api connection in unit test > Rename consul.URL to consul.servers > Refactor tests > Refactor tests to run consul for each parallel node > Read consul RetryInterval and LockTTL from config > test script > Add consul to acquire lock for routing-api Submodule src/github.com/cactus/go-statsd-client 00000000...d8eabe07 (new submodule) Submodule src/github.com/coreos/etcd 6335fdc59..2b67f5256: > *: bump to v2.3.1 > client: return original ctx error > rafthttp: do not block on proposal > *: bump to v2.3.0+git > Merge pull request #4788 from gyuho/release_doc > Merge pull request #4801 from gyuho/version_2_3 > Merge pull request #4800 from gyuho/version > Merge pull request #4782 from gyuho/upgrade_to_2.3 > Merge pull request #4795 from xiang90/table > Merge pull request #4792 from heyitsanthony/snip-snip > Merge pull request #4793 from gyuho/proxy_doc > Merge pull request #4791 from xiang90/l > Merge pull request #4783 from xiang90/fix_4753 > Merge pull request #4787 from coreos/xiang90-patch-1 > Merge pull request #4760 from heyitsanthony/clientv3-stm > Merge pull request #4781 from gyuho/csv > Merge pull request #4779 from xiang90/cq > Merge pull request #4777 from mqliang/member-leaderinfo > Merge pull request #4778 from xiang90/lease_promote > Merge pull request #4772 from xiang90/bk > Merge pull request #4770 from hongchaodeng/master > Merge pull request #4768 from xiang90/ctl > Merge pull request #4766 from gyuho/sample > Merge pull request #4763 from gyuho/real_latency > Merge pull request #4764 from siddontang/master > Merge pull request #4761 from heyitsanthony/txn-noninteractive > Merge pull request #4762 from gyuho/typo > Merge pull request #4758 from xiang90/sync > Merge pull request #4714 from mitake/v3-auth-enable > Merge pull request #4757 from xiang90/mm > Merge pull request #4756 from coreos/xiang90-patch-1 > Merge pull request #4754 from xiang90/fdatasync > Merge pull request #4726 from ajityagaty/mk_in_order > Merge pull request #4753 from xiang90/leader_par > Merge pull request #4752 from aboyett/auth-doc-fix > Merge pull request #4751 from xiang90/doc > Merge pull request #4748 from xiang90/t > Merge pull request #4747 from xiang90/re > Merge pull request #4743 from xiang90/doc > Merge pull request #4739 from heyitsanthony/e2e-tempdir > Merge pull request #4742 from xiang90/update_b > Merge pull request #4741 from xiang90/defrag_c > Merge pull request #4738 from xiang90/shrink_rpc > Merge pull request #4736 from heyitsanthony/fix-setdir-help > Merge pull request #4735 from xiang90/fix_write > Merge pull request #4733 from heyitsanthony/backend-alignment > Merge pull request #4732 from xiang90/i_future_watch > Merge pull request #4731 from xiang90/backend > Merge pull request #4729 from xiang90/raft_fix > Merge pull request #4728 from gyuho/util > Merge pull request #4720 from heyitsanthony/fix-testremovemember > Merge pull request #4721 from heyitsanthony/build-scary-archs > Merge pull request #4718 from xiang90/v3_api > Merge pull request #4717 from joshix/portsnote > Merge pull request #4710 from heyitsanthony/clientv3-tlsconfig > Merge pull request #4711 from heyitsanthony/nuke-invfuturerev-test > Merge pull request #4704 from gyuho/print_rate > Merge pull request #4707 from heyitsanthony/fix-newmember-comment > Merge pull request #4706 from heyitsanthony/fix-client-close-deadlock > Merge pull request #4705 from xiang90/benchmark > Merge pull request #4703 from xiang90/future_watch > Merge pull request #4696 from heyitsanthony/fix-e2e-quorum > Merge pull request #4701 from gyuho/typo > Merge pull request #4693 from heyitsanthony/etcdctl-fix-lists > Merge pull request #4699 from heyitsanthony/fix-barrier > Merge pull request #4698 from xiang90/fix_w > Merge pull request #4643 from gyuho/stress > Merge pull request #4695 from gyuho/endpoints > Merge pull request #4690 from heyitsanthony/fix-etcdctl-fullroles > Merge pull request #4689 from hongchaodeng/master > Merge pull request #4687 from gyuho/example > Merge pull request #4638 from gyuho/compact > Merge pull request #4675 from gyuho/bench_watch > Merge pull request #4678 from gyuho/watch_notify_clientv3 > Merge pull request #4682 from heyitsanthony/clientv3-clientctx > Merge pull request #4683 from heyitsanthony/recipes-err-handling > Merge pull request #4680 from xiang90/test_l > Merge pull request #4677 from heyitsanthony/clientv3-wr-err > Merge pull request #4674 from xiang90/progress > Merge pull request #4676 from heyitsanthony/clientv3-fix-cancel-retry > Merge pull request #4669 from xiang90/rev > Merge pull request #4670 from gyuho/tc > Merge pull request #4672 from heyitsanthony/fix-mutex-lostwaiter > Merge pull request #4655 from heyitsanthony/etcdctl-election > Merge pull request #4660 from xiang90/shrink_db > Merge pull request #4664 from gyuho/alpha1 > Merge pull request #4663 from gyuho/endpoints > Merge pull request #4658 from mitake/v3-auth-enable > Merge pull request #4657 from heyitsanthony/v3-procfile-ports > Merge pull request #4654 from gyuho/govet_tip > Merge pull request #4649 from mitake/v3-auth-proto > Merge pull request #4650 from peterbourgon/fix-raft-node-config-docs > Merge pull request #4646 from xiang90/starvation > Merge pull request #4647 from heyitsanthony/nuke-timeutil > Merge pull request #4614 from heyitsanthony/future-watch-rpc > Merge pull request #4645 from gyuho/clientv3_README > Merge pull request #4416 from endocode/kayrus/relink > Merge pull request #4644 from gyuho/doc > Merge pull request #4613 from heyitsanthony/clientv3-composite > Merge pull request #4639 from xiang90/grpc > Merge pull request #4635 from gyuho/endpoints > Merge pull request #4632 from gyuho/watchid > Merge pull request #4630 from heyitsanthony/clientv3-watcher-closecancel > Merge pull request #4631 from msingle/patch-1 > Merge pull request #4566 from xiang90/com > Merge pull request #4619 from heyitsanthony/clientv3-do > Merge pull request #4623 from heyitsanthony/clientv3-fix-lease-panic > Merge pull request #4621 from xiang90/auto-compaction > Merge pull request #4618 from hongchaodeng/master > Merge pull request #4617 from gyuho/txn_example > Merge pull request #4611 from xiang90/p_s > Merge pull request #4612 from gyuho/watch_not_panic > Merge pull request #4604 from heyitsanthony/etcdctl-lock > Merge pull request #4580 from AdoHe/etcdctl_use_endpoints > Merge pull request #4607 from endocode/kayrus/remove_dashes > Merge pull request #4605 from heyitsanthony/fixup-godocs > Merge pull request #4602 from gyuho/watch_option > Merge pull request #4600 from gyuho/opoption_doc > Merge pull request #4601 from hongchaodeng/master > Merge pull request #4592 from gyuho/doc > Merge pull request #4597 from heyitsanthony/etcdctlv3-format > Merge pull request #4594 from xiang90/wi > Merge pull request #4591 from heyitsanthony/etcdctlv3-nuke-teletypes > Merge pull request #4571 from heyitsanthony/txn-interactive > Merge pull request #4575 from aknuds1/fix-clustering-docs > Merge pull request #4590 from gyuho/clientv3_doc > Merge pull request #4585 from heyitsanthony/fix-testtriggersnap > Merge pull request #4582 from heyitsanthony/godoc-ci > Merge pull request #4583 from gyuho/delete > Merge pull request #4581 from heyitsanthony/recipes-clientv3 > Merge pull request #4574 from heyitsanthony/clientv3-lease-ctx > Merge pull request #4579 from heyitsanthony/txn-fix-if-clobber > Merge pull request #4578 from gyuho/travis > Merge pull request #4572 from xiang90/fix_tester_leak > Merge pull request #4570 from xiang90/ctl_mirror > Merge pull request #4569 from gyuho/stress > Merge pull request #4565 from xiang90/ctl_watch > Merge pull request #4533 from skarekrow/patch-1 > Merge pull request #4534 from mitake/obsolete-comment > Merge pull request #4564 from heyitsanthony/fix-watchreconnrequest > Merge pull request #4562 from xiang90/get > Merge pull request #4563 from hongchaodeng/master > Merge pull request #4561 from heyitsanthony/gotip-shadow > Merge pull request #4560 from heyitsanthony/v3-delete-withfromkey > Merge pull request #4557 from xiang90/del > Merge pull request #4556 from heyitsanthony/watcher-batch > Merge pull request #4553 from xiang90/raft_http > Merge pull request #4555 from heyitsanthony/v3-with-prefix > Merge pull request #4558 from gyuho/path_fix > Merge pull request #4550 from xiang90/etcdctl_put > Merge pull request #4549 from gyuho/path > Merge pull request #4548 from gyuho/plog > Merge pull request #4547 from gyuho/timeout > Merge pull request #4528 from heyitsanthony/fix-watchcurrev > Merge pull request #4546 from xiang90/batch > Merge pull request #4542 from xiang90/t > Merge pull request #4539 from xiang90/snap > Merge pull request #4537 from gyuho/mk > Merge pull request #4536 from gyuho/tidy_cleanup > Merge pull request #4535 from xiang90/mirrormaker > Merge pull request #4532 from xiang90/ctlv3 > Merge pull request #4529 from gyuho/govet > Merge pull request #4523 from xiang90/syncer > Merge pull request #4525 from heyitsanthony/fix-tls-proxy > Merge pull request #4521 from heyitsanthony/fix-doublebarrierfailover > Merge pull request #4516 from gyuho/path > Merge pull request #4049 from xiang90/raft_comment > Merge pull request #4520 from xiang90/bench > Merge pull request #4462 from mitake/benchmark-watch > Merge pull request #4514 from xiang90/tester > Merge pull request #4513 from gyuho/f1 > Merge pull request #4507 from gyuho/better_hash > Merge pull request #4495 from heyitsanthony/snapshot-command > Merge pull request #4501 from xiang90/lt > Merge pull request #4510 from xiang90/client_support > Merge pull request #4508 from xiang90/l > Merge pull request #4506 from xiang90/w > Merge pull request #4505 from heyitsanthony/v3-range-ge > Merge pull request #4497 from hongchaodeng/docs > Merge pull request #4499 from heyitsanthony/apply-scheduler > Merge pull request #4500 from gyuho/etcdctl_doc > Merge pull request #4486 from gyuho/f1 > Merge pull request #4494 from xiang90/sched > Merge pull request #4408 from xiang90/revoke > Merge pull request #4493 from xiang90/fix_ctl > Merge pull request #4489 from heyitsanthony/fix-watcher-reqresend > Merge pull request #4490 from gyuho/godoc > Merge pull request #4488 from gyuho/page_cache > Merge pull request #4487 from gyuho/leader_api > Merge pull request #4483 from heyitsanthony/clientv3-op-opts > Merge pull request #4447 from xiang90/sched > Merge pull request #4481 from xiang90/testing-tool > Merge pull request #4476 from heyitsanthony/fix-raftexample-restart > Merge pull request #4460 from mitake/build > Merge pull request #4473 from heyitsanthony/clientv3-ctx-kv > Merge pull request #4472 from gyuho/f0 > Merge pull request #4470 from gyuho/test > Merge pull request #4471 from heyitsanthony/fix-integration-certs > Merge pull request #4468 from gyuho/f0 > Merge pull request #4466 from gyuho/f0 > Merge pull request #4467 from gyuho/f00 > Merge pull request #4458 from xiang90/cl > Merge pull request #4457 from gyuho/f0 > Merge pull request #4456 from mitake/v3-put-0-args > Merge pull request #4455 from heyitsanthony/etcdctlv3-compaction-err > Merge pull request #4450 from mitake/v3-put-stdin > Merge pull request #4454 from heyitsanthony/v3-cmp > Merge pull request #4449 from gyuho/f0 > Merge pull request #4453 from heyitsanthony/v3-withoption > Merge pull request #4164 from cchamplin/ttl-refresh > Merge pull request #4452 from xiang90/too_large > Merge pull request #4438 from adamwg/raftexample-add-nodes > Merge pull request #4439 from xiang90/fix_tr > Merge pull request #4448 from gyuho/f0 > Merge pull request #4410 from mitake/security-options > Merge pull request #4445 from gyuho/func > Merge pull request #4437 from heyitsanthony/fix-testv2ctlwatch > Merge pull request #4431 from heyitsanthony/rafthttp-localurl > Merge pull request #4442 from xiang90/rpc_err > Merge pull request #4441 from philips/add-videos-to-v3-doc > Merge pull request #4433 from gyuho/f0 > Merge pull request #4436 from heyitsanthony/txnfail-reconn > Merge pull request #4434 from xiang90/bolt > Merge pull request #4430 from heyitsanthony/clientv3-test-kv-retry > Merge pull request #4429 from heyitsanthony/fix-testtxnwritefail > Merge pull request #4432 from gyuho/f0 > Merge pull request #4428 from gyuho/f0 > Merge pull request #4426 from gyuho/f0 > Merge pull request #4412 from gyuho/f0 > Merge pull request #4421 from jonboulle/master > Merge pull request #4413 from gyuho/TestKVCompact > Merge pull request #4423 from xiang90/id > Merge pull request #4418 from xiang90/ci > Merge pull request #4409 from heyitsanthony/v3-txn-tests > Merge pull request #4406 from gyuho/f0 > Merge pull request #4407 from heyitsanthony/txn-no-retry > Merge pull request #4402 from heyitsanthony/minority-failure > Merge pull request #4401 from QuentinPerez/format > Merge pull request #4404 from gyuho/hash > Merge pull request #4399 from mitake/genproto > Merge pull request #4400 from mitake/v3-member-tirivial > Merge pull request #4396 from xiang90/fix_watch > Merge pull request #4395 from xiang90/fix_watch > Merge pull request #4392 from xiang90/watch > Merge pull request #4394 from heyitsanthony/coalesce-stacks > Merge pull request #4393 from xiang90/fix_test > Merge pull request #4390 from xiang90/watch > Merge pull request #4389 from xiang90/watch > Merge pull request #4387 from heyitsanthony/integration-cluster-speedup > Merge pull request #4386 from xiang90/promote > Merge pull request #4376 from heyitsanthony/txn-no-duplicate-putkey > Merge pull request #4382 from xiang90/lease_keep_test > Merge pull request #4383 from xiang90/client_no_end > Merge pull request #4360 from heyitsanthony/v3-client-watcher > Merge pull request #4372 from gyuho/kv_delete > Merge pull request #4373 from heyitsanthony/clientv3-unix-endpoints > Merge pull request #4374 from xiang90/member_api > Merge pull request #4375 from xiang90/kvapi_no_retry > Merge pull request #4371 from gyuho/govet_lease > Merge pull request #4370 from gyuho/kv_lease > Merge pull request #4361 from gyuho/e2e > Merge pull request #4367 from xiang90/lease_test > Merge pull request #4366 from heyitsanthony/fix-rejectinsecure > Merge pull request #4353 from xiang90/lease > Merge pull request #4364 from heyitsanthony/goword-typos > Merge pull request #4363 from xiang90/watch > Merge pull request #4362 from gyuho/leaky_raft > Merge pull request #4359 from joshix/kayrus-deprcpeers > Merge pull request #4358 from gyuho/typo > Merge pull request #4357 from gyuho/govet > Merge pull request #4356 from gyuho/range > Merge pull request #4354 from coreos/revert-4348-clientv3_integration_test > Merge pull request #4349 from heyitsanthony/v3-client-conntls > Merge pull request #4351 from gyuho/e2e > Merge pull request #4348 from gyuho/clientv3_integration_test > Merge pull request #4346 from gyuho/watch_timeout > Merge pull request #4344 from shawnps/patch-3 > Merge pull request #4339 from shawnps/patch-2 > Merge pull request #4340 from shawnps/patch-3 > Merge pull request #4343 from shawnps/patch-6 > Merge pull request #4342 from shawnps/patch-5 > Merge pull request #4341 from shawnps/patch-4 > Merge pull request #4336 from gyuho/clientv3_test > Merge pull request #4334 from heyitsanthony/fix-4333 > Merge pull request #4335 from xiang90/ts > Merge pull request #4331 from xiang90/c_t > Merge pull request #4330 from gyuho/proxy_e2e > Merge pull request #4329 from xiang90/client_txn > Merge pull request #4328 from heyitsanthony/v3-client-conntimeout > Merge pull request #4327 from gyuho/minor_govet > Merge pull request #4325 from xiang90/client_lease > Merge pull request #4323 from xiang90/client_watch > Merge pull request #4316 from xiang90/client_ops > Merge pull request #4324 from jonboulle/master > Merge pull request #4320 from sublee/fix-typo > Merge pull request #4314 from xiang90/clientv3_impl > Merge pull request #4312 from heyitsanthony/v3-client-connretry > Merge pull request #4313 from xiang90/clientv3 > Merge pull request #4295 from heyitsanthony/v3-recipes-leases > Merge pull request #4306 from heyitsanthony/v3-client > Merge pull request #3536 from xiang90/client > Merge pull request #4301 from gyuho/no_pipe > Merge pull request #4293 from bdarnell/bcast-after-commit > Merge pull request #4302 from srijs/patch-2 > Merge pull request #4300 from gyuho/grpc_dial > Merge pull request #4298 from heyitsanthony/fix-testapplysnapshot-race > Merge pull request #4297 from ngaut/ngaut/raft-typo > Merge pull request #4294 from xiang90/member_api > Merge pull request #4292 from gyuho/gRPC_update > Merge pull request #4290 from heyitsanthony/fix-apply-noents > Merge pull request #4291 from bdarnell/remove-commit > Merge pull request #4289 from xiang90/member_api > Merge pull request #4282 from xiang90/range_invalid > Merge pull request #4281 from mitake/remove-cached-auth-flag > Merge pull request #4284 from xiang90/max_txn > Merge pull request #4283 from heyitsanthony/fix-stopdelay-leak > Merge pull request #4246 from bdarnell/commit-after-remove-node > Merge pull request #4274 from xiang90/leasehttp > Merge pull request #4275 from xiang90/fix_lease_restore > Merge pull request #4261 from gyuho/racey_e2e > Merge pull request #4272 from srijs/patch-2 > Merge pull request #4273 from srijs/patch-3 > Merge pull request #4269 from heyitsanthony/v3-reject-put-bogus-lease > Merge pull request #4267 from gyuho/govet > Merge pull request #4266 from gyuho/minor_govet > Merge pull request #3889 from gyuho/raft_doc.go_20151118 > Merge pull request #4262 from heyitsanthony/v3-lease-watch-expire > Merge pull request #4238 from heyitsanthony/v3-recipes > Merge pull request #4260 from heyitsanthony/v3-lease-forward-keepalive > Merge pull request #4253 from heyitsanthony/v3-lease-grant-consistency > Merge pull request #4254 from gyuho/check_wait > Merge pull request #4252 from gyuho/client_doc > Merge pull request #4231 from mitake/go-client-doc > Merge pull request #4250 from mitake/ls-quorum > Merge pull request #4249 from gyuho/minor_typo > Merge pull request #4242 from gyuho/unsynced_multi > Merge pull request #4248 from gyuho/rest_of_unsynced_test > Merge pull request #4247 from gyuho/unsynced_cancel > Merge pull request #4228 from mitake/procfile-pprof > Merge pull request #4237 from gyuho/multi_stream > Merge pull request #4235 from gyuho/watch_multi_synced > Merge pull request #4232 from heyitsanthony/test-fmt-first > Merge pull request #4236 from heyitsanthony/fix-watch-test-race > Merge pull request #4224 from heyitsanthony/v3-rangereq-more-flag > Merge pull request #4227 from gyuho/wait_response > Merge pull request #4225 from gyuho/watch_test_multi > Merge pull request #4223 from gyuho/watch_cancel_test > Merge pull request #4196 from Timer/etcdctl-docs > Merge pull request #4222 from heyitsanthony/concurrent-watch-testing > Merge pull request #4215 from xiang90/fix_proxy > Merge pull request #4218 from gyuho/test_header_revision > Merge pull request #4217 from heyitsanthony/start-store-on-rev1 > Merge pull request #4214 from gyuho/watch_integration_test > Merge pull request #4211 from gyuho/stack_watch > Merge pull request #4210 from xiang90/fix_panic > Merge pull request #4212 from gyuho/typo_packages > Merge pull request #4208 from xiang90/fix_test > Merge pull request #4179 from wangjia184/master > Merge pull request #4201 from mitake/benchmark-pprof > Merge pull request #4206 from xiang90/fix_test > Merge pull request #4200 from mitake/deadcode > Merge pull request #4190 from heyitsanthony/v3-integration-test > Merge pull request #4202 from gyuho/prefix_watch > Merge pull request #4185 from xiang90/client-srv > Merge pull request #4204 from gyuho/typo > Merge pull request #4187 from gyuho/store_stats > Merge pull request #4193 from gyuho/etcdctl_help_doc > Merge pull request #4192 from heyitsanthony/gexpect-tests > Merge pull request #4155 from mitake/pprof > Merge pull request #4199 from heyitsanthony/fix-recorder-datarace > Merge pull request #4194 from gyuho/etcdctl_check_key > Merge pull request #4195 from davygeek/master > Merge pull request #4186 from xiang90/fix_store > Merge pull request #4184 from heyitsanthony/v3-rangereq-sort > Merge pull request #4188 from xiang90/lease_stop > Merge pull request #4178 from xiang90/lease_keepalive > Merge pull request #4173 from xiang90/lease_attach > Merge pull request #4176 from xiang90/refactor > Merge pull request #4175 from xiang90/lease_expire > Merge pull request #4174 from heyitsanthony/fix-limit-keepalive > Merge pull request #4167 from xiang90/lease_promote > Merge pull request #4169 from gyuho/typo > Merge pull request #4161 from gyuho/typo_in_benchmark > Merge pull request #4162 from xiang90/lease > Merge pull request #4165 from heyitsanthony/benchmark-stddev > Merge pull request #4163 from mordyovits/patch-1 > Merge pull request #4159 from gyuho/kv_header > Merge pull request #4160 from xiang90/fix_lease > Merge pull request #4158 from heyitsanthony/nolease-to-leasepkg > Merge pull request #4153 from xiang90/fix_listener > Merge pull request #4154 from xiang90/snapshot_from_backend > Merge pull request #4151 from xiang90/s > Merge pull request #4152 from xiang90/fix_force > Merge pull request #4150 from gyuho/fix_arg_update_dir > Merge pull request #4138 from gyuho/watchresponse_header > Merge pull request #4147 from heyitsanthony/listener-unix-sockets > Merge pull request #4141 from ngaut/ngaut/refactor > Merge pull request #4143 from siddontang/master > Merge pull request #4142 from gyuho/delete_test_file > Merge pull request #4140 from xiang90/storage > Merge pull request #4137 from xiang90/lease > Merge pull request #4134 from xiang90/lease > Merge pull request #4126 from heyitsanthony/testutil-recorder-stream > Merge pull request #4133 from gyuho/event_map_lookup > Merge pull request #4132 from heyitsanthony/watchid-typedef > Merge pull request #4130 from gyuho/remove_cancelfunc > Merge pull request #4131 from xiang90/kv_lease > Merge pull request #4128 from akolb1/akolb1-4127 > Merge pull request #4129 from gyuho/licence_2016 > Merge pull request #4125 from ngaut/ngaut/refactor > Merge pull request #4123 from ngaut/ngaut/typo > Merge pull request #4122 from gyuho/watchid_events > Merge pull request #4120 from xiang90/ctrl_w > Merge pull request #4118 from xiang90/ctrl_w > Merge pull request #4117 from xiang90/rm_watching > Merge pull request #4114 from xiang90/r_watch_stream > Merge pull request #4112 from xiang90/proto > Merge pull request #4091 from gyuho/watch_events_slice > Merge pull request #4070 from mitake/storage-bench > Merge pull request #4108 from xiang90/proto > Merge pull request #4105 from heyitsanthony/benchmark-put-seq-keys > Merge pull request #4104 from xiang90/ctl > Merge pull request #4100 from mitake/ignore-benchmark > Merge pull request #4098 from gyuho/merge_log > Merge pull request #4094 from heyitsanthony/send-merged-done-nowait > Merge pull request #4096 from heyitsanthony/serialize-applier-snapmerge > Merge pull request #3986 from mqliang/defer > Merge pull request #4093 from xiang90/rm_proto > Merge pull request #4092 from xiang90/api > Merge pull request #4090 from xiang90/writable > Merge pull request #4089 from xiang90/fix > Merge pull request #4060 from heyitsanthony/fix-etcdctl-err > Merge pull request #4087 from gyuho/delete_discovery_check > Merge pull request #4084 from gyuho/revisioin_document > Merge pull request #4085 from gyuho/doc_iana > Merge pull request #4043 from gyuho/storage_range_all_unsynced > Merge pull request #4082 from gyuho/storage_test_cleanup > Merge pull request #4081 from heyitsanthony/benchmark-multi-ep > Merge pull request #4059 from xiang90/snap_log > Merge pull request #4079 from gyuho/store_shadow > Merge pull request #4064 from xiang90/reduce_fysnc > Merge pull request #4078 from jonboulle/master > Merge pull request #4071 from gyuho/store_event_node > Merge pull request #4073 from gyuho/remove_seed > Merge pull request #4030 from mitake/endpoint-selection > Merge pull request #4066 from gyuho/tip_shadow > Merge pull request #4038 from AkihiroSuda/etcd-4007 > Merge pull request #4062 from xiang90/fix_snap > Merge pull request #4063 from heyitsanthony/fix-shouldstop > Merge pull request #4056 from heyitsanthony/benchmark-less-mem > Merge pull request #4047 from heyitsanthony/test-activate-raftexample > Merge pull request #4050 from xiang90/fsync > Merge pull request #3935 from dgonyeo/master > Merge pull request #4054 from jonboulle/master > Merge pull request #4051 from xiang90/log > Merge pull request #4048 from xiang90/util > Merge pull request #3882 from colhom/etcd2-backup > Merge pull request #4041 from heyitsanthony/v3-snapshot-low-latency > Merge pull request #4046 from heyitsanthony/etcdserver-server-select-refactor > Merge pull request #4045 from philips/add-raftexample-to-raft-docs > Merge pull request #4042 from jonboulle/master > Merge pull request #4040 from gyuho/godep_20151221 > Merge pull request #4036 from gyuho/storage_test_unsynced > Merge pull request #4037 from xiang90/proxy > Merge pull request #4033 from heyitsanthony/raftexample-tests > Merge pull request #4020 from xiang90/ctl_04 > Merge pull request #4032 from gyuho/one_mutex_for_storage > Merge pull request #4024 from heyitsanthony/add-command-argusage > Merge pull request #4028 from gyuho/storage_test_variable > Merge pull request #4026 from jonboulle/master > Merge pull request #4027 from jcderr/patch-1 > Merge pull request #4025 from jonboulle/sjpotter-api-nits > Merge pull request #4014 from ppalucki/functional > Merge pull request #4011 from heyitsanthony/raftexample > Merge pull request #4013 from mickep76/update-libraries-and-tools > Merge pull request #4006 from mitake/kvtest-deadlock > Merge pull request #4010 from gyuho/window_compile > Merge pull request #4004 from mitake/go-vet-fix > Merge pull request #4000 from xiang90/production_users > production-users.md: add cycoresys.com > Merge pull request #3997 from stevenschlansker/opentable-prod > Merge pull request #3992 from xiang90/fix_rafthttp_test > Merge pull request #3991 from xiang90/fix_lock > Merge pull request #3988 from philips/add-production-users-doc > Merge pull request #3987 from gyuho/storage_test > Merge pull request #3981 from gyuho/govet > Merge pull request #3980 from jonboulle/master > Merge pull request #3978 from xiang90/rh > Merge pull request #3977 from xiang90/fix_todo > Merge pull request #3976 from xiang90/snap_fix > Merge pull request #3970 from xiang90/snapshot > Merge pull request #3975 from Masterlvng/fix-readme > Merge pull request #3972 from xiang90/fix_race > Merge pull request #3973 from xiang90/purge_test > Merge pull request #3968 from sjpotter/fix-build > Merge pull request #3952 from BramGruneir/snapshot > Merge pull request #3960 from gyuho/genproto > Merge pull request #3958 from gyuho/build_gotip > Merge pull request #3959 from xiang90/fix_storage_test > Merge pull request #3957 from gyuho/travis_matrix > Merge pull request #3956 from mitake/test-gofmt > Merge pull request #3945 from xiang90/new_watch_bench > Merge pull request #3951 from gyuho/travis > Merge pull request #3948 from xiang90/refactor > Merge pull request #3947 from xiang90/fix_purge > Merge pull request #3946 from xiang90/fix_snap_test > Merge pull request #3940 from gyuho/add_map_test > Merge pull request #3942 from ngaut/master > Merge pull request #3939 from xiang90/fix_watch > Merge pull request #3937 from gyuho/proxy_typo > Merge pull request #3933 from ngaut/fix-shadow-variables > Merge pull request #3936 from joshix/proxydoc-jx > Merge pull request #3871 from gyuho/proxy_doc_improve_20151115 > Merge pull request #3934 from xiang90/new_benchmark_tool > Merge pull request #3922 from gyuho/etcdctlv3_with_cobra > Merge pull request #3927 from nordligulv/patch-1 > Merge pull request #3857 from es-chow/remove-multinode-goroutine > Merge pull request #3923 from gyuho/duplicate_exit > Merge pull request #3921 from barakmich/fix_issue_3920 > Merge pull request #3917 from xiang90/raft_stepdown > Merge pull request #3918 from gyuho/V3Procfile > Merge pull request #3915 from philips/add-bdarnell > Merge pull request #3913 from xiang90/update_doc > Merge pull request #3911 from gyuho/proc_double_dash > Merge pull request #3895 from yichengq/storage-watchid > Merge pull request #3899 from gyuho/3859_synced_map > Merge pull request #3905 from xiang90/etcdctl_health > Merge pull request #3887 from ypu/flags > Merge pull request #3890 from gyuho/pipeline_full_message > Merge pull request #3904 from coreos/jonboulle-patch-2 > Merge pull request #3897 from xiang90/fix_watch > Merge pull request #3898 from mitake/get-quorum > Merge pull request #3892 from xiang90/fix_snapshot_handling > Merge pull request #3851 from yichengq/storage-kv-data > Merge pull request #3893 from coreos/jonboulle-patch-1 > Merge pull request #3782 from gyuho/doc.go_for_package_description > Merge pull request #3885 from joshix/prodready > Merge pull request #3883 from gyuho/raft_typo > Merge pull request #3881 from xiang90/godep > Merge pull request #3880 from xiang90/fix_stop > Merge pull request #3873 from yichengq/func-long-timeout > Merge pull request #3875 from xiang90/fix_txn > Merge pull request #3877 from bdarnell/campaign-while-leader > Merge pull request #3876 from jonboulle/master > Merge pull request #3862 from xiang90/watch_bench_doc > Merge pull request #3870 from yichengq/fix-raft-log > Merge pull request #3868 from xiang90/fix_auth_guest > Merge pull request #3865 from gyuho/map_populate_for_unix > Merge pull request #3860 from gyuho/typo_in_wal > Merge pull request #3858 from gyuho/godep_bolt_20151112 > Merge pull request #3853 from xiang90/lease_new > Merge pull request #3856 from xiang90/raft_doc_restart > Merge pull request #3855 from xiang90/raft_doc > Merge pull request #3849 from gyuho/etcdmain_typos_descriptions > Merge pull request #3834 from xiang90/lease_new > Merge pull request #3700 from xiang90/metrics_hi > Merge pull request #3847 from gyuho/doc_flag_issue3690 > Merge pull request #3771 from yichengq/cors-auth > Merge pull request #3844 from gyuho/docker_guide_etcd_version > Merge pull request #3841 from joshix/toolexamplelink > Merge pull request #3839 from xiang90/rename > Merge pull request #3838 from mlahaye/typofix > Merge pull request #3819 from gyuho/shorten_interval_for_first_retrials > Merge pull request #3835 from gyuho/doc_typo_20151108 > Merge pull request #3830 from xiang90/bolt > Merge pull request #3829 from jonboulle/master > *: bump to v2.3.0-alpha.0+git > *: bump to v2.3.0-alpha.0 > Merge pull request #3825 from jonboulle/master > Merge pull request #3826 from jonboulle/scripts > Merge pull request #3822 from mitake/strict-reconfig-error-log > Merge pull request #3818 from yichengq/req-snap-log > Merge pull request #3802 from yichengq/fix-storage-watch > Merge pull request #3809 from xiang90/rpc_kv > Merge pull request #3813 from yichengq/update-version > Merge pull request #3811 from gyuho/storage_watchergauge_fix > Merge pull request #3810 from gyuho/storage_metrics_add_watcher_gauge > Merge pull request #3808 from yichengq/fix-wait-test > Merge pull request #3796 from yichengq/fix-get-version > Merge pull request #3804 from xiang90/ctl_watch > Merge pull request #3807 from xiang90/kv > Merge pull request #3783 from yichengq/merge-logger > Merge pull request #3801 from yichengq/fix-raft-timeout > Merge pull request #3800 from xiang90/watch_server > Merge pull request #3799 from gyuho/nameing_in_metrics_watching > Merge pull request #3798 from xiang90/watch_new > Merge pull request #3795 from xiang90/watch_stream > Merge pull request #3797 from gyuho/procfile_20151103 > Merge pull request #3794 from yichengq/fix-proxy-term > Merge pull request #3785 from yichengq/fix-block-test > Merge pull request #3790 from xiang90/etcd-top > Merge pull request #3792 from wojtek-t/update_ugorji > Merge pull request #3762 from jonboulle/auth > Merge pull request #3781 from gyuho/doc_typo_20151029 > Update ROADMAP.md > Update ROADMAP.md > Merge pull request #3759 from yichengq/rafthttp-unreachable > Merge pull request #3776 from gyuho/etcdmain_doc > Merge pull request #3772 from xiang90/watcher_sep > Merge pull request #3770 from yichengq/link-etcdctl > Merge pull request #3767 from kamilhark/master > Merge pull request #3768 from yichengq/fix-publish-test > Merge pull request #3769 from msoap/fix-docs > Merge pull request #3746 from yichengq/load-storage > Merge pull request #3758 from xiang90/race > Merge pull request #3749 from gyuho/etcdmain_flags_20151025 > Merge pull request #3757 from xiang90/race > Merge pull request #3750 from yichengq/rafthttp-continue > Merge pull request #3756 from suryanathan/master > Merge pull request #3755 from jonboulle/master > Merge pull request #3748 from coreos/revert-3737-rafthttp-continue > Merge pull request #3737 from yichengq/rafthttp-continue > Merge pull request #3742 from yichengq/save-index > Merge pull request #3744 from yichengq/fix-sem > Merge pull request #3741 from yichengq/receive-restore > Merge pull request #3730 from yichengq/storage-consistent > Merge pull request #3729 from xiang90/mem_bench > Merge pull request #3733 from yichengq/fix-wait-timeout > Merge pull request #3731 from yichengq/storage-kv > Merge pull request #3588 from gyuho/storage/watchable_store.go-use-map-for-unsynced > Merge pull request #3732 from yichengq/config-header > Merge pull request #3725 from joshix/hdinghier-mulligan > Merge pull request #3726 from yichengq/watch-store > Merge pull request #3727 from yichengq/govet > Merge pull request #3724 from coreos/philips-patch-1 > Merge pull request #3720 from yichengq/clean-streamAppV1 > Merge pull request #3683 from yichengq/raft-block > Merge pull request #3721 from mitake/servevars > Merge pull request #3656 from endocode/kayrus/client_doc > Merge pull request #3718 from gyuho/gyuho_README > Merge pull request #3716 from yichengq/add-sem-badge > Merge pull request #3657 from xiang90/fix_remove > Merge pull request #3703 from xiang90/bolt > Merge pull request #3707 from xiang90/CI > Merge pull request #3708 from xiang90/travis > Merge pull request #3704 from xiang90/rafthttp > Merge pull request #3697 from mqliang/cluster-health > Merge pull request #3701 from xiang90/rm_end_watcher > Merge pull request #3694 from philips/fix-configuration-headers > Merge pull request #3691 from gyuho/documentation_20151015 > Merge pull request #3685 from gyuho/etcdctl_mk_command_2 > Merge pull request #3689 from ccding/patch-1 > Merge pull request #3687 from ccding/patch-1 > Merge pull request #3611 from mitake/etcdctl-timeout > Merge pull request #3681 from yichengq/godep-update > Merge pull request #3680 from gyuho/Documentation_20151014 > Merge pull request #3666 from yichengq/transport-snap > ROADMAP: fix v3 API issues link > Merge pull request #3665 from raoofm/patch-2 > Merge pull request #3664 from yichengq/transport-more > Merge pull request #3663 from yichengq/transport-rt > Merge pull request #3662 from yichengq/transport > Merge pull request #3660 from gyuho/Documentation_typos_20151009 > Merge pull request #3655 from wojtek-t/update_dependency > Merge pull request #3658 from mqliang/patch-2 > Merge pull request #3644 from mitake/test-race > Merge pull request #3649 from kkaneda/kkaneda/comment_fix > Merge pull request #3616 from yichengq/storage-txn > Merge pull request #3643 from xiang90/metrics_storage > Merge pull request #3635 from yichengq/parse-ipv6 > Merge pull request #3637 from yichengq/run-snapshot > Merge pull request #3640 from xiang90/watch_metrics > Merge pull request #3638 from gyuho/documentation_proxy > Merge pull request #3608 from yichengq/storage-snapshot > Merge pull request #3631 from yichengq/create-snapshot > Merge pull request #3634 from yichengq/fix-cluster-output > Merge pull request #3633 from xiang90/systemd_readiness > Merge pull request #3607 from xiang90/doc_name > Merge pull request #3632 from mickep76/master > Merge pull request #3614 from yichengq/snapshot-store > Merge pull request #3627 from jelmer/typofix > Merge pull request #3093 from mwitkow-io/feature/httpd_metrics > Merge pull request #3629 from ccding/master > Merge pull request #3625 from yichengq/fix-race > Documentation: 04 snapshot: add example with fleet > Documentation: fix-up the kubernetes github URL > Merge pull request #3609 from yichengq/raft-snapshot > Merge pull request #3610 from yichengq/load-storage > Merge pull request #3590 from yichengq/discovery-log > Merge pull request #3606 from kkaneda/kkaneda/tiny_fix > Merge pull request #3604 from gyuho/replace_netutil_BasicAuth > Merge pull request #3530 from mitake/etcdctl-timeout-v2 > docs: fix link > Merge pull request #3596 from xiang90/json_header > Merge pull request #3579 from gyuho/etcdserver/etcdhttp/httptypes/errors.go-WriteTo-returns-error > Merge pull request #3594 from yichengq/exit > Merge pull request #3593 from xiang90/fix_race > Merge pull request #3564 from gouyang/master > Merge pull request #3554 from mitake/reconfig-doc > Merge pull request #3585 from xiang90/fix_hash > Merge pull request #3584 from mickep76/master > Merge pull request #3577 from gyuho/storage/watchable_store.go-defer-fix > Merge pull request #3555 from xiang90/proxy_doc > Merge pull request #3570 from yichengq/extend-timeout > Merge pull request #3566 from xiang90/error_msg > Merge pull request #3573 from TheHippo/patch-1 > Merge pull request #3408 from MSamman/extend-auth-api > Merge pull request #3556 from xiang90/better_error_logging > Merge pull request #3563 from dnaeon/fixes > Merge pull request #3558 from yichengq/watch > Merge pull request #3561 from ceh/raft-doc-typo > Merge pull request #3533 from xiang90/proxy > Merge pull request #3547 from bdarnell/multinode-node-ids > Merge pull request #3543 from mitake/reconfig-remove > Merge pull request #3544 from xiang90/bench > Merge pull request #3548 from yichengq/travis > Merge pull request #3534 from xiang90/grpc_err > Merge pull request #3546 from gae123/patch-1 > Merge pull request #3540 from xiang90/bench > Merge pull request #3539 from xiang90/bench > Merge pull request #3538 from xiang90/bench > Merge pull request #3537 from jonboulle/master > Merge pull request #3535 from xiang90/rev > Merge pull request #3507 from yichengq/watch > Merge pull request #3529 from yichengq/snapshot > Merge pull request #3526 from yichengq/snapshot > Merge pull request #3528 from xiang90/compact > Merge pull request #3524 from xiang90/grpc_error > Merge pull request #3525 from gyuho/master > Merge pull request #3521 from raoofm/patch-3 > Merge pull request #3514 from xiang90/v3_raft > Merge pull request #3516 from xiang90/hash_improved > Merge pull request #3506 from philips/improve-tocommit-error > Merge pull request #3449 from yichengq/cleanup-max-election > Merge pull request #3508 from amarshall/patch-3 > Merge pull request #3511 from xiang90/v3_raft > Merge pull request #3510 from xiang90/v3_raft > Merge pull request #3509 from xiang90/v3_raft > Merge pull request #3479 from mitake/membership > Merge pull request #3501 from yichengq/update-peers > Merge pull request #3500 from yichengq/fix-ETCD > Merge pull request #3495 from rekby/patch-2 > Merge pull request #3497 from jonboulle/master > Merge pull request #3486 from yichengq/readme > Merge pull request #3487 from onlyjob/master > Merge pull request #3483 from xiang90/update_roadmap > Merge pull request #3482 from yichengq/client > *: bump to v2.2.0+git > *: bump to v2.2.0 > Merge pull request #3478 from endocode/kayrus/typo_fix > Merge pull request #3473 from MrLawes/master > Merge pull request #3459 from yichengq/release-doc > Merge pull request #3448 from yichengq/release-script > Merge pull request #3204 from endocode/kayrus/recovery > Merge pull request #3465 from raoofm/patch-1 > Merge pull request #3463 from yichengq/update-roadmap > Merge pull request #3461 from xiang90/doc > Merge pull request #3451 from raoofm/patch-1 > Merge pull request #3447 from xiang90/txn > Merge pull request #3446 from xiang90/v3 > Merge pull request #3445 from xiang90/api_doc > Merge pull request #3440 from yichengq/memory-bench > Merge pull request #3444 from xiang90/doc > Merge pull request #3443 from xiang90/test > Merge pull request #3442 from xiang90/b > Merge pull request #3434 from xiang90/index_revision > Merge pull request #3438 from yichengq/storage-test > Merge pull request #3439 from akolb1/godep_all_fixes > Merge pull request #3436 from xiang90/remove_consistent_token > Merge pull request #3429 from xiang90/upgrade_doc > Merge pull request #3435 from xiang90/gogoproto > Merge pull request #3433 from tamird/proto-import-path > Merge pull request #3432 from coreos/robszumski-patch-1 > Merge pull request #3395 from yichengq/backend-test > Merge pull request #3412 from yichengq/etcdctl-sync > Merge pull request #3415 from yichengq/better-err > Merge pull request #3418 from AdoHe/fix_build_script_error > Merge pull request #3424 from akolb1/bolt_solaris1 > Merge pull request #3321 from yichengq/doc-tls-setup > Merge pull request #3308 from yichengq/go-codec > Merge pull request #3421 from xiang90/3411 > Merge pull request #3413 from xiang90/snapshot_dir > Merge pull request #3420 from yichengq/wait-more > Merge pull request #3416 from yichengq/get-cluster-timeout > Merge pull request #3404 from bdarnell/multinode-propose-panic > Merge pull request #3403 from xiang90/doc > Merge pull request #3401 from xiang90/more_metrics > Merge pull request #3409 from xiang90/fix_force_new > Merge pull request #3407 from MSamman/fix-build-warning > Merge pull request #3398 from xiang90/storage_metrics > Merge pull request #3396 from bdarnell/multinode-propose-panic > *: bump to v2.2.0-rc.0+git > *: bump to v2.2.0-rc.0 > Merge pull request #3388 from sckott/docfix-tuning > Merge pull request #3394 from yichengq/bench-2.2 > Merge pull request #3390 from xiang90/ctl_peer > Merge pull request #3392 from yichengq/bench-2.2 > Merge pull request #3387 from yichengq/fix-quorum > Merge pull request #3384 from yichengq/fix-shadow > Merge pull request #3382 from xiang90/env > Merge pull request #3383 from cognusion/fixes2 > Merge pull request #3354 from mx2323/faq > Merge pull request #3368 from yichengq/storage-test > Merge pull request #3376 from yichengq/connection-down > Merge pull request #3377 from yichengq/tls-info-string > Merge pull request #3378 from yichengq/set-late > Merge pull request #3096 from philips/tls-info-debug > Merge pull request #3375 from xiang90/doc > Merge pull request #3374 from yichengq/gomaxprocs > Merge pull request #3372 from xiang90/doc > Merge pull request #3367 from MSamman/master > Merge pull request #3373 from ecnahc515/add_report_bugs_contributing > Merge pull request #3371 from xiang90/bolt > Merge pull request #3362 from yichengq/rafthttp-cancel > Merge pull request #3360 from yichengq/bench-3 > Merge pull request #3366 from xiang90/v3_proto > Merge pull request #3361 from yichengq/no-log > Merge pull request #3359 from yichengq/storage-test > Merge pull request #3357 from ccding/master > Merge pull request #3356 from xiang90/travis > Merge pull request #3355 from yichengq/health-var > Merge pull request #3342 from xiang90/travis > Merge pull request #3352 from yichengq/fix-name-url > Merge pull request #3346 from xiang90/auth_skip > Merge pull request #3348 from xiang90/l > Merge pull request #3344 from xiang90/startup_version > Merge pull request #3340 from xiang90/fix_perallocate > Merge pull request #3338 from spacejam/master > Merge pull request #3327 from yichengq/bench-2.2 > Merge pull request #3334 from mitake/snap-marsharing-prometheus > Merge pull request #3323 from xiang90/cl_health > Merge pull request #3320 from yichengq/doc-rtt > Merge pull request #3324 from xiang90/raft_logging > Merge pull request #3326 from elimisteve/master > Merge pull request #3325 from elimisteve/master > Merge pull request #3322 from philips/use-proxy-as-default-endpoint > Merge pull request #3303 from yichengq/auth-path > Merge pull request #3301 from yichengq/ca-file > Merge pull request #3311 from yichengq/request-timeout > Merge pull request #3315 from xiang90/key_err > Merge pull request #3314 from sebschrader/proxy-loop > Merge pull request #3313 from yichengq/internal-timeout > Merge pull request #3310 from xiang90/http_err > Merge pull request #3309 from xiang90/enforce > Merge pull request #3305 from xiang90/c_v > Merge pull request #3307 from ian-kelling/master > Merge pull request #3302 from xiang90/v > Merge pull request #3299 from xiang90/txn > Merge pull request #3295 from yichengq/err-example > *: bump to v2.2.0-alpha.1+git > *: bump to v2.2.0-alpha.1 > Merge pull request #3293 from yichengq/improve-err > Merge pull request #3291 from yichengq/auth-cap > Merge pull request #3289 from yichengq/marshal > Merge pull request #3153 from gtank/tls-setup > Merge pull request #3275 from xiang90/sort > Merge pull request #3286 from yichengq/fit-2.2 > Merge pull request #3287 from xiang90/update_roadmap > Merge pull request #3285 from yichengq/bump-capnslog > *: bump to v2.2.0-alpha.0+git > *: bump to v2.2.0-alpha.0 > Merge pull request #3277 from yichengq/better-log > Merge pull request #3271 from yichengq/doc-discovery > Merge pull request #3273 from polvi/kube-hack > Merge pull request #3270 from xiang90/better_err > Merge pull request #3190 from yichengq/adjust-prop-timeout > Merge pull request #3254 from es-chow/log-group > Merge pull request #3266 from yichengq/client-readme > Merge pull request #3263 from xiang90/ctl_tr > Merge pull request #3194 from yichengq/client-readme > Merge pull request #3262 from yichengq/client-deadline > Merge pull request #3245 from yichengq/client_timeout > Merge pull request #3248 from xiang90/v3 > Merge pull request #3256 from xiang90/update_log > Merge pull request #3243 from xiang90/conf > Merge pull request #3159 from sofuture/master > Merge pull request #3249 from philips/get-etcd-running-under-arm64 > Merge pull request #3242 from xiang90/typo > Merge pull request #3241 from yichengq/sync-pin > Merge pull request #3239 from xiang90/improve_probing > Merge pull request #3240 from xiang90/fix_log > Merge pull request #3184 from yichengq/fast-bootstrap > Merge pull request #3220 from yichengq/fix-auth-check > Merge pull request #3216 from yichengq/cancel-err > Merge pull request #3217 from yichengq/update-migrate-example > Merge pull request #3229 from xiang90/f_cerr > Merge pull request #3225 from yichengq/client-record-err > Merge pull request #3233 from xiang90/srv_discovery > Merge pull request #3219 from yichengq/limit-listener > Merge pull request #3231 from xiang90/fallocate > Merge pull request #3187 from yichengq/client-keep-sync > Merge pull request #2688 from xiang90/versioning > Merge pull request #3222 from mitake/wal-log-error > Merge pull request #3224 from xiang90/fix_ls > Merge pull request #3210 from xiang90/probing > Merge pull request #3196 from eyakubovich/fix-watch-timeout > Merge pull request #3197 from xiang90/health > Merge pull request #3207 from xiang90/rm_migration > Merge pull request #3200 from xiang90/d_doc > Merge pull request #3202 from yichengq/fix-etcdctl-watch > Merge pull request #3116 from offscale/master > Merge pull request #3199 from xiang90/sdnotify > Merge pull request #3091 from barakmich/client_auth_cov > Merge pull request #3178 from yichengq/refactor-cluster-health > Merge pull request #3185 from xiang90/add_debug_endpoint > Merge pull request #2891 from glensc/patch-1 > Merge pull request #3181 from xiang90/2.2-client-error > Merge pull request #3176 from yichengq/reject-high-election > Merge pull request #3180 from shafreeck/master > Merge pull request #3164 from yichengq/pin-endpoint > Merge pull request #3114 from yichengq/clean-raft-init > Merge pull request #3150 from gouyang/master > Merge pull request #3183 from xiang90/txn > Merge pull request #3166 from yichengq/publish-timeout > Merge pull request #3175 from xiang90/2.2-ctl-bug > Merge pull request #3174 from xiang90/2.2_submit_bug > Merge pull request #3165 from yichengq/client-quorum > etcdmian: fix initialization confilct > etcdmain: warn when listening on HTTP if TLS is set > etcdctl: update -peers to default to use schema > discovery: return bad discovery endpoint error > client: consume json error and return ErrInvaildJSON > pkg/transport: fix HTTPS downgrade bug for keepalive listener > etcdctl: added domain discovery flag > *: detect duplicate name for discovery bootstrap > types: add len func for urlmaps > etcdctl: support member update command > client: add member update > etcdctl: print out key and action when watching recursively > godep: remove go-etcd dependency > etcdctl: health use etcd/client > etcdctl: import snap use etcd/client > etcdctl: remove old stuff > etcdctl: exec_watch use etcd/client > etcdctl: watch use etcd/client > etcdctl: ls use etcd/client > etcdctl: updatedir use etcd/client > etcdctl: update use etcd/client > etcdctl: rmdir use etcd/client > etcdctl: mk use etcd/client > etcdctl: minor cleanup > etcdctl: make rm use etcd/client > etcdctl: make setdir/mkdir use etcd/client > etcdctl: make set command use etcd/client > etcdctl: make get command use etcd/client > *: bump to v2.1.1+git Submodule src/github.com/jinzhu/gorm 000000000...5409931a1 (new submodule) Submodule src/github.com/jinzhu/inflection 000000000...1c35d901d (new submodule) Submodule src/github.com/tedsuo/rata 6197c97c6..b15ebd8bd: > Merge pull request #1 from cf-guardian/master Signed-off-by: John Shahid <[email protected]>
1 parent ace1933 commit 43fb5ca

File tree

13 files changed

+54
-5
lines changed

13 files changed

+54
-5
lines changed

.gitmodules

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,3 +365,15 @@
365365
path = src/code.cloudfoundry.org/loggregator-api
366366
url = https://github.com/cloudfoundry/loggregator-api
367367
branch = master
368+
[submodule "src/code.cloudfoundry.org/cf-tcp-router"]
369+
path = src/code.cloudfoundry.org/cf-tcp-router
370+
url = https://github.com/cloudfoundry-incubator/cf-tcp-router
371+
[submodule "src/github.com/jinzhu/gorm"]
372+
path = src/github.com/jinzhu/gorm
373+
url = https://github.com/jinzhu/gorm
374+
[submodule "src/github.com/cactus/go-statsd-client"]
375+
path = src/github.com/cactus/go-statsd-client
376+
url = https://github.com/cactus/go-statsd-client
377+
[submodule "src/github.com/jinzhu/inflection"]
378+
path = src/github.com/jinzhu/inflection
379+
url = https://github.com/jinzhu/inflection

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ On OS X, follow these steps to install and configure MySQL and Postgres:
144144

145145
CREATE USER 'diego'@'localhost' IDENTIFIED BY 'diego_password';
146146
GRANT ALL PRIVILEGES ON `diego\_%`.* TO 'diego'@'localhost';
147+
GRANT ALL PRIVILEGES ON `routingapi\_%`.* TO 'diego'@'localhost';
147148

148149
8. Install Postgres (version 9.4 or higher is required):
149150

packages/route_emitter/spec

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,24 @@ files:
2929
- code.cloudfoundry.org/route-emitter/nats_emitter/*.go # gosub
3030
- code.cloudfoundry.org/route-emitter/routing_table/*.go # gosub
3131
- code.cloudfoundry.org/route-emitter/syncer/*.go # gosub
32+
- code.cloudfoundry.org/route-emitter/tcp/emitter/*.go # gosub
33+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/*.go # gosub
34+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/*.go # gosub
35+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/endpoint/*.go # gosub
36+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/event/*.go # gosub
37+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/util/*.go # gosub
38+
- code.cloudfoundry.org/route-emitter/tcp/syncer/*.go # gosub
39+
- code.cloudfoundry.org/route-emitter/tcp/watcher/*.go # gosub
3240
- code.cloudfoundry.org/route-emitter/watcher/*.go # gosub
41+
- code.cloudfoundry.org/routing-api/*.go # gosub
42+
- code.cloudfoundry.org/routing-api/models/*.go # gosub
3343
- code.cloudfoundry.org/routing-info/cfroutes/*.go # gosub
44+
- code.cloudfoundry.org/routing-info/tcp_routes/*.go # gosub
3445
- code.cloudfoundry.org/runtimeschema/metric/*.go # gosub
46+
- code.cloudfoundry.org/trace-logger/*.go # gosub
47+
- code.cloudfoundry.org/uaa-go-client/*.go # gosub
48+
- code.cloudfoundry.org/uaa-go-client/config/*.go # gosub
49+
- code.cloudfoundry.org/uaa-go-client/schema/*.go # gosub
3550
- code.cloudfoundry.org/workpool/*.go # gosub
3651
- github.com/bmizerany/pat/*.go # gosub
3752
- github.com/cloudfoundry/dropsonde/*.go # gosub
@@ -50,6 +65,7 @@ files:
5065
- github.com/cloudfoundry/gosteno/*.go # gosub
5166
- github.com/cloudfoundry/gosteno/syslog/*.go # gosub
5267
- github.com/cloudfoundry/sonde-go/events/*.go # gosub
68+
- github.com/dgrijalva/jwt-go/*.go # gosub
5369
- github.com/gogo/protobuf/gogoproto/*.go # gosub
5470
- github.com/gogo/protobuf/proto/*.go # gosub
5571
- github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub

packages/route_emitter_windows/spec

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,24 @@ files:
3030
- code.cloudfoundry.org/route-emitter/nats_emitter/*.go # gosub
3131
- code.cloudfoundry.org/route-emitter/routing_table/*.go # gosub
3232
- code.cloudfoundry.org/route-emitter/syncer/*.go # gosub
33+
- code.cloudfoundry.org/route-emitter/tcp/emitter/*.go # gosub
34+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/*.go # gosub
35+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/*.go # gosub
36+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/endpoint/*.go # gosub
37+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/schema/event/*.go # gosub
38+
- code.cloudfoundry.org/route-emitter/tcp/routing_table/util/*.go # gosub
39+
- code.cloudfoundry.org/route-emitter/tcp/syncer/*.go # gosub
40+
- code.cloudfoundry.org/route-emitter/tcp/watcher/*.go # gosub
3341
- code.cloudfoundry.org/route-emitter/watcher/*.go # gosub
42+
- code.cloudfoundry.org/routing-api/*.go # gosub
43+
- code.cloudfoundry.org/routing-api/models/*.go # gosub
3444
- code.cloudfoundry.org/routing-info/cfroutes/*.go # gosub
45+
- code.cloudfoundry.org/routing-info/tcp_routes/*.go # gosub
3546
- code.cloudfoundry.org/runtimeschema/metric/*.go # gosub
47+
- code.cloudfoundry.org/trace-logger/*.go # gosub
48+
- code.cloudfoundry.org/uaa-go-client/*.go # gosub
49+
- code.cloudfoundry.org/uaa-go-client/config/*.go # gosub
50+
- code.cloudfoundry.org/uaa-go-client/schema/*.go # gosub
3651
- code.cloudfoundry.org/workpool/*.go # gosub
3752
- github.com/bmizerany/pat/*.go # gosub
3853
- github.com/cloudfoundry/dropsonde/*.go # gosub
@@ -51,6 +66,7 @@ files:
5166
- github.com/cloudfoundry/gosteno/*.go # gosub
5267
- github.com/cloudfoundry/gosteno/syslog/*.go # gosub
5368
- github.com/cloudfoundry/sonde-go/events/*.go # gosub
69+
- github.com/dgrijalva/jwt-go/*.go # gosub
5470
- github.com/gogo/protobuf/gogoproto/*.go # gosub
5571
- github.com/gogo/protobuf/proto/*.go # gosub
5672
- github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub
Submodule cf-tcp-router added at 3e1383d
Submodule route-emitter updated 53 files
Submodule go-statsd-client added at d8eabe0
Submodule etcd updated from 6335fdc to 2b67f52

0 commit comments

Comments
 (0)