https://github.com/hashicorp/terraform.git
Squashed 'src/github.com/hashicorp/terraform/' content from commit 1244bff

git-subtree-dir: src/github.com/hashicorp/terraform
git-subtree-split: 1244bff399bafff3cf9ce2127523c9a7c2f92935
Merge commit 'd7018f975ff5aab66ae10e0f96e41c110ead72ec' as 'src/github.com/hashicorp/terraform'
Squashed 'src/github.com/abh/geodns/' changes from ad2ba94..2fb9b66

2fb9b66 Test on Go 1.1 for a bit longer even if we don't support it
9e2150b Format SRV documentation
2ac9b6d Make benchmark test work again
58a655e Upgrade go-bindata to latest version
669e97c Simplify histograms
9633557 Bump year
36184e8 Fix occasional test failure for NS records configured in legacy format
a68f161 Don't add a '.' prefix on the record header on apex records
f2639a9 Go 1.2+ only
7612ef5 Fix missing imports
99f9bd8 gocheck has moved from launchpad to github
24d9545 Add /48 subnet targeting for IPv6 ip targeting
fc3fd3d Avoid manipulating IPs as strings when making the /24 IP target
75bbf57 Fix targeting tests; IP targets are now enclosed in []'s
f61dc40 Also test with go tip on travis-ci
df3ae25 Upgrade go-metrics api to the latest version, clean up qCounter global variable
c4a5ec7 Merge pull request #51 from coocood/master
7aa8894 update ip format
b5f0b19 Merge pull request #49 from afsheenb/add_srv_records
fbc924f Merge pull request #52 from gpapilion/geodns-issue-26
023b8bd Adds tests for #26
9a15376 Addresses issue 26 if i understand it correctly
bc56e80 go fmt
2223ff8 support IP/24
c58fdf2 update travis to download database and change Go tip to Go 1.2
3c3cb3e add resolver asn and ip targeting
8a95293 removed sshfp type def, this is not the PR we're looking for
cf13c1f Added support for SRV records, plus documentation and tests

git-subtree-dir: src/github.com/abh/geodns
git-subtree-split: 2fb9b66aa90fedb48fd538ab50f8efc53ce33e46
Merge commit '45f754bba9552bfff80732a7d537540dfe01ca2f'
Squashed 'src/github.com/abhishekkr/goshare/' changes from ad3d1a6..0a6126c

0a6126c adding travis.yaml
7c51148 helper library added for 'requestor' for 0MQ, README update for LICENSE
c353104 LICENSE added MIT, one read aim added
f44f08a sample config file that can be passed to goshare
40f0e9a now just start goshare server, and browse wiki by 'go-tasks.sh wiki'
d81b2da more wiki files to be served at local goshare http itself
1c415ea goshare usability wiki for HTTP and ZeroMQ channels
23b4225 goshare self-wiki updated 127.0.0.1/quickstart
cf09980 goshare documents user-concepts' draft-1
608d172 goshare documents quick-start's draft-1
818913c go-tasks test updated and fixed
e8c2175 feature test run added to go-tasks test
96cedd0 goshare documents started for easier grasp over its philosophy, design and usgage
4c7d8bc feature tests moved to <repo>/tests
3d3c9d1 read/del also using power of multi-val val-type
205a650 gohttp updated for tsds TimDot creation only in push
5db84e2 go0mq with dbtasks have been updated to use Packet
b020403 gohttp updated to use DBTasks Packets, also added ParentNS support
be8e6eb refactored, added dbtasks Packet for abstraction of internal actions
77e0e4c flag handling improved, config flag introduced for config-file override
503ff08 pushing multi-val with parent_namespace to prefix all keys
1e71fda goshare_daemon made to use abhishekkr/gol/golservice
f32da1a bin task creating server/daemon binary './gotasks.sh bin'; Changelog++
ba41427 gohttp_client updated with some examples for csv and json, CHANGELOG started
08d2798 added json support to multi-val, fixed multi-val support for non-tsds type
59ff975 zxtra now has a goshare_daemon for daemonized server and goshare_server
9e74190 Merge pull request #1 from abhishekkr/dbtasks_refaktor
1ef5515 gohttp make default key_type if none; zxtra updated to check
998701c gohttp key_type match for tsds corrected to cover all, zxtra updated
a1592d3 gohttp made /db handle all actions and then specific action based GET
a5532c6 just a reminder on GET action behavior
93118d0 gohttp updated for no mandatory val field
981e4e5 updated zxtra/go0mq_client as per updates
82961bb dbtasks corrected, gohttp adapted new dbtasks calls
8309c11 go0mq extracted DBTasks to dbtasks with axn,key_type,msg_arr_of_data
a190021 goshare adapted for Config driven instance, not directly flags
22ea1cf [broken] dbtasks splitted per action and mid-way multi-type for push
8dd47bb just splitted up goshare to goshareengine and quick run thru
98ad570 updated gohttp plug and example for TSDS-CSV
1194665 updated README,gitignore,go-tasks added
68270b6 updated go0mq plug for TSDS-CSV
44710de updated dbtasks for all updates to levigoNS/TSDS, added PushCSVTSDS
d4ebca8 axn: 'push' got type: 'tsds-csv' to get a csv and push
4950077 refactoring over goshare package, removed func passing not required
30068dd trimming out extra prints from go0mq

git-subtree-dir: src/github.com/abhishekkr/goshare
git-subtree-split: 0a6126cfaa60e48ebab2edf3421995102d18b6c7
Merge commit 'c0d134983acd4bd57f3da61e019cc428c6ffb94a'
Squashed 'src/github.com/ActiveState/tail/' content from commit fd3ba4e

git-subtree-dir: src/github.com/ActiveState/tail
git-subtree-split: fd3ba4e64ca930fe21edc4c8a8bd1a075ef7f4ac
Merge commit 'd1dc0ba65b4325f8974f873c96749e8fe7496b9e' as 'src/github.com/ActiveState/tail'
Squashed 'src/github.com/adnaan/hamster/' changes from 3d7000a..5ec553a

5ec553a Update README.md

git-subtree-dir: src/github.com/adnaan/hamster
git-subtree-split: 5ec553a2c314919d87eb5d5a1153622e7133fc75
Merge commit '882e668f34fec7639ef191c94b5673583e74ed3b'
Squashed 'src/github.com/apcera/gnatsd/' changes from 7da1e87..c01c3e1

c01c3e1 Merge pull request #34 from simonleung8/selfReferenceFix
afc9f62 remove self referencing ip/host
7e198fb Changed travis image link.
11afe75 Merge pull request #37 from apcera/coveralls.yml
683bbc6 Should have been included from the coveralls instructions to know more.
a8c9c6d Merge pull request #36 from apcera/add-coveralls
2661e88 Add a small script to run the tests and report to coveralls in travis.
ec72a05 Just test 1.3
a48084a Make sure to account for route connections
bfe88c3 test fixups for 1.3, add in test for leaked route Go routines
13d256b Fix minor races, add in 1.3 to testing, bump version
c0941c9 Docker support for generating single executable image
3e86a2c Added cluster restart test with queue subscribers
0464ad3 Reload config option.
bdb94fc Added some 1.3 options.
a364e85 Merge pull request #32 from apcera/allow-external-listener
ae0e8e5 Write back resolved port to options.
8014866 PR feedback (nits)
20b08f5 Allow nats to choose a random port when given port -1.
76aa5a2 Merge pull request #31 from apcera/add-addr-helper
e6d6088 Added Server.Addr() helper to allow querying of the server's bound address
4a52201 Moved travis status.
e172f4b Fixed issue #29 with subscriptions leaking across routes on auto-unsubscribe
cd56514 pass by address
2141cc7 bad copy of file
ac975a9 Bumped version
de4e748 Added perf test for defers and parseInt
5d820d8 Merge pull request #30 from pivotal-cf-experimental/profiling-port-config-file
7c0f112 perf results
8945221 Make profiling port configurable via file
98b7482 syntax
ff2e2d4 Should receive msgs
53c5674 Added results from go1.2.1 on new MBA
5a64b25 Added in three and four token match benchmarks

git-subtree-dir: src/github.com/apcera/gnatsd
git-subtree-split: c01c3e15d9f5f55baac1f1987ccfbdc7c9947a29
Merge commit '5b967c84ea1eb46a7d7ba8b5114939b20e8fc010'
Squashed 'src/github.com/apcera/nats/' changes from abf226a..add27da

add27da Merge pull request #26 from apcera/race_stats
e4ac009 Add race safe Stats() that clones public Statistics
9e6eafc Added netchan bad arg test
1af9456 Fixed typos in wildcard example.
be36a72 small sleep
f2a11f3 Fix for netchan #25, bumped version
dc1ef38 Merge pull request #24 from apcera/add-coveralls
375edba Coveralls support for bats.
c0bed13 Merge pull request #23 from apcera/chan_leaks
4173a46 Better handling of timeouts for Travis
d503d95 Fixed #22 to avoid leaking Go routines with netchan implementation
023e2af Fixed multiple connections example.
19a0f99 Modified slow consumer processing and tests, bumped version
067221c spelling
0154cf5 Add in the vet tool
02bb71b Just test Go 1.2.2
bc15bc1 Merge branch 'master' of https://github.com/apcera/nats
0cff3d6 Bug fix #20: bad queue subscribers after restart
ed2b428 Added link to godoc, reference to gnatsd server.
d45d307 syntax
46eae6c Copyright and minor updates.

git-subtree-dir: src/github.com/apcera/nats
git-subtree-split: add27da5cd5d0ec20c901e348863115102eca571
Merge commit '6c559108f2419a212ec25025e06820527cfeca21'
Squashed 'src/github.com/benbjohnson/go-raft/' changes from 220f460..73f9c44

73f9c44 Merge pull request #220 from xiangli-cmu/fix_join
c76c5d9 Merge pull request #224 from unihorn/89
de644b0 fix(peer): set lastActivity even if no response is received
0687ff8 Merge pull request #221 from influxdb/check-for-errors
c6ae3cf check for errors in serialization and deserialization
d2d1e26 fix(join safty) only allow commit to the most recent join command if there is one
047192e Merge pull request #217 from xiangli-cmu/fix_data_race
bf84fb1 fix(server.go) fix data race between func LogEntries and func appendEntry The append function in appendEntry might change the value of the slice pointer when it wants to grow the capacity of the slice. We are not protecting the content of the slice, since the LogEntries func is just used for internal testing. The main reason of this pull request is to make the race detector happy during the testing.
3b1dea1 Merge pull request #215 from xiangli-cmu/fix_channel_race
72bb1cd Merge pull request #216 from xiangli-cmu/init_comment
563a597 chore(server.go) add comment for init
b6b4e57 fix(server.go) check server state before send event to channel This commit fixs a data race between server.Start() and server.send(). Before this commit, server send might receive on a uninitialized stopped channel. To fix this, we initialize the channle before we change the server state to a running state. Then we check the state before receive on the stopped channel.
cfa43a1 Merge pull request #213 from xiangli-cmu/fix_update_state
0ccec83 fix(server.go) remove extra calls of setState Fix a bug introduced the by race fix. The setState function should not be called if there is no state change.
585c580 Merge pull request #211 from unihorn/55
1961d0a chore(server): improve comment
4b45c1f chore(server): avoid blocking on event send
5f87be1 Merge branch 'master' of github.com:goraft/raft
f94d98c Merge pull request #208 from xiangli-cmu/fix_init
0cfbf0c test(snapshot) add tests for recovery from previous snapshot and log
2802722 fix(server.go) fix that the server cannot be inited after loading snapshot. We cannot use log.empty to check if the log has been loaded or not. After we load the snapshot, log.empty will be false but we has not loaded the previous log. We introduce log.initialized to indicate that we have loaded the previous log file.
01e8793 Merge pull request #205 from xiangli-cmu/fix_data_race
748ed55 chore(handler): add error message
e63296e fix: wait for all goroutines to finish before Stop
c6bdf63 Merge pull request #209 from tsenart/master
2ab0a83 util: Handle all errors in writeFileSync
cbc15dc fix(transporter) set ResponseHeaderTimeout before using it; avoid data race
1c4fa98 fix(server.go) use server.setState everywhere
7b3522c fix(peer.go) protect lastActivity with peer lock
f762c2f fix(server.go) fix data race in server.stop Use setState() function to set state; avoid data race.
aa3d8b7 Merge pull request #197 from xiangli-cmu/remove_extra_lock
6bf34b9 Merge pull request #204 from xiangli-cmu/init
30ecfdb fix(server.Init) fix snapshot mkdir error handling We should report all errors other than existErr.
b9272d0 Merge pull request #203 from xiangli-cmu/init
7a2b6e1 fix(server.Init) Fix wrong error reporting We should only report error if the snapshot path is not exist and we cannot create a new one.
e74517b Merge pull request #198 from xiangli-cmu/init
a9c25bd feat(server.go) introduce server.Init() This commit enable dividing raft server starting process to two phases. So application can do extra work based on the status of the raft server before starting it. To implement this, we add a initialization phase, in which raft server reads in the log entires from data-dir and commits to the last recorded index.
aeffdc9 Merge pull request #201 from unihorn/44
91c0e3c chore: add interface for FlushCommitIndex
1be467f feat(server): add FlushCommitIndex
eedd7cc Merge pull request #199 from benbjohnson/fix-stop-state
b0f4d04 Set state after Stop().
0baef41 refactor(server.go) No lock is needed when reading server variables in a internal function Our server is a single routine for loop. We have a lock to avoid "data-race" between the external function calls and internal operations(writes). So we can drop the extra lock when reading variables internally.
d660352 Merge pull request #195 from xiangli-cmu/fix_remove_deadlock
12e7a19 fix(server.go) fix potential deadlock when removing nodes When server entries removePeer, it is holding log write lock. peer.stopHeartbeat might also need to acquire log read lock to finish. We need to make peer.stopHeartbeat non-blocking to fix the deadlock. Also actually there is no need to wait for the peer go-routine to stop.
3bc5b1b Merge pull request #194 from benbjohnson/peer-latency
c2dc64e Add Peer.LastActivity().
c096aa9 Merge pull request #190 from xiangli-cmu/snapshot_cleanup
7debffb refactor(server) cleanup snapshot
6251f50 Merge pull request #192 from benbjohnson/read-full
c79ddde Change LogEntry.Decode() to use io.ReadFull().
30f261b Merge pull request #189 from xiangli-cmu/snapshot_rename
907350f refactor(server) rename currentSnapshot->pendingSnapshot, lastSnapshot->snapshot for clearity
c5e7390 Merge pull request #181 from xiangli-cmu/refactor_set_currentTerm
67fe8a1 introduce _assert
f734cff Merge pull request #185 from xiangli-cmu/remove_travis
aed3d62 Added Weed File System using go-raft
570a610 remove(travis) do not need this file anymore
18a742a Merge pull request #183 from xiangli-cmu/remove_else
cd230b9 refactor(server.go) change server.stopped a chan of chan It is a clean way to sync between a function call and a goroutine.
61d6f8e refactor(server.go) change setCurrentTerm to updateCurrentTerm process functions should always compare the term simplify the logic of updateCurrentTerm remove uncessary setState
c06da81 Merge pull request #179 from xiangli-cmu/refactor_candidate_loop
02d5905 tests(server_test.go) add test for processVoteResponse
8caef60 refactor(server.go) refactor candidate loop
baa7bbe Merge pull request #174 from xiangli-cmu/combine_files
1f17738 Refactor combine related files into one file Go-raft used to have different files for different structures. This pull request combines related files, since there are too many files in the root package.
bfee414 Merge pull request #178 from goraft/commit-event
9a25388 Dispatch commit event.

git-subtree-dir: src/github.com/benbjohnson/go-raft
git-subtree-split: 73f9c4439b79819178fffa968f13729b101bb02d
Merge commit '6d80027e30e3baa918f33161b7f91bcc82751619'
Squashed 'src/github.com/bitly/google_auth_proxy/' changes from 7d0a823..1c0989f

1c0989f Merge pull request #25 from jehiah/google_oauth_migration_25
590e0b5 bump to 0.1.0
98fb800 update to new scopes
715656d Merge pull request #23 from zhangcheng/master
78ad2f4 Make it looks a little better in mobile browsers
5205e9a Merge pull request #21 from dbrgn/errmsg_typo
cfe186d Fixed wrong error message
14e845d Merge pull request #18 from ploxiln/add_license_18
736da1e Merge pull request #19 from justindowning/patch-1
e52a86d Update README with new Google Developers workflow
2361fb0 add MIT license for google_auth_proxy
18b4612 Merge pull request #16 from drewolson/master
964929a Allow specifying multiple google apps domains.

git-subtree-dir: src/github.com/bitly/google_auth_proxy
git-subtree-split: 1c0989ff583e4f441533d331eb37d30fc5bcdd33
Merge commit '935ffeb7eba0c6421c9c22b60df4e45bb20e400f'
Squashed 'src/github.com/bitly/nsq/' changes from e74b284..1e7866e

1e7866e Merge pull request #435 from mreiferson/more_logging_435
90deb44 go vet
94c8e8e nsqadmin: more logging refactoring
a93fda8 nsqlookupd: more logging refactoring
f7fa211 nsqd: more logging refactoring
fdc5ec3 Merge pull request #434 from mreiferson/testing_refactoring_434
f347416 rename options variables
4d8f241 rename context variables
9efaa69 pqueue: remove assert dependency
81d4581 nsqlookupd: remove assert dependency
a2ff07a nsqlookupd: improved testing logging
8e62bf8 deps: remove assert/pretty/text
21c4125 nsqd: explicitly clean up test connections
f572312 deps: bump go-snappystream to v0.2.0
7c45c5c nsqd: remove assert test dependency
d44b116 test: don't run with -v
772c951 nsqd: improved test logging
d8538d1 nsqlookupd: pluggable logging
a4cca2a util: pluggable logging
3691a45 nsqd: pluggable logging
6f36905 nsqadmin: pluggable logging
a2e1a23 nsqd: fix/add diskqueue benchmarks
d16a701 Merge pull request #412 from secondbit/paddy_dockerfiles
72fa668 Create Dockerfiles.
375a9c4 Merge pull request #429 from mreiferson/worker_id_429
95fd7b7 nsqd: error if worker-id out of range (update help text)
40232db Merge pull request #428 from mreiferson/fix_msg_timeout_428
9ca7c4b nsqd: IDENTIFY should respond with materialized msg_timeout
a7d05a3 Revert "Revert "nsqd: healthy flag""
6259ae2 bump v0.2.30 stable
49dedf5 Revert "nsqd: healthy flag"
79d12d4 Merge pull request #422 from mreiferson/unhealthy_422
babf8ea nsqd: healthy flag
aaf3087 Merge pull request #423 from mreiferson/test_touch_423
323dc5e nsqd: loosen timings on TestTouch
d66989b Merge pull request #425 from mreiferson/n2n_shared_state_425
b8191eb nsq_to_http, nsq_to_nsq: fix race on handler.counter
b484249 go vet
3f358a3 nsq_to_nsq, nsq_to_http: per-host upstream host status output
1750802 nsq_to_http, nsq_to_nsq: fix shared request state
ceaef75 Merge pull request #426 from mreiferson/bench_protocol_panic_426
fa05f35 nsqd: fix BenchmarkProtocolV2Exec panic
2a2786f Merge pull request #424 from mreiferson/n2n_bug_424
bcede01 nsq_to_nsq: fix 0 length percentile bug
2032801 Merge pull request #417 from jehiah/ssl_debugging_417
46bbf15 bump version
c442849 expose TLS connection stats in nsqd stats, and nsqadmin
06718fc add to_nsq to .gitignore
da03e4f bump v0.2.29 stable
dc49c17 to_nsq: app to PUB stding to NSQ
28f0bbe Merge pull request #413 from mreiferson/test_client_timeout_413
f6edfed nsqd: deflake TestClientTimeout
463623f Merge pull request #411 from secondbit/paddy_fix_dotdotdot
5e67b9f Rename test package.
9bd7aea Create empty file to fix go build ./...
401c499 Merge pull request #406 from crossjam/builtin_assets
072ac69 Issue #405: serve external static assets from embedded server
0c417fa nsqd: fix gc memory collection bug for statsd
2549bc6 Merge pull request #408 from jehiah/bump_go_nsq_408
790622d bump go-nsq
c8ddec6 Merge pull request #407 from jehiah/touch_logic_407
c08abe2 nsqd: use client's msg timeout for TOUCH
f27923b touch should set new timeout based on now; not last timeout
0c33ce3 Merge pull request #390 from mreiferson/stuck_in_flight_390
9412895 nsqd: log client IDENTIFY
f1b807c nsqd: fix missing lock around client map
f874049 nsqd: fix inflight pqueue remove 'double Pop'
c5375c5 nsqd: improve in flight pqueue remove test
e62dc51 Merge pull request #397 from jehiah/handler_397
a3f98eb sync with go-nsq AddHandler changes
fadcff5 Merge pull request #392 from juliangruber/patch-1
e42c195 nsqadmin: fix https by removing scheme from jquery url
8b2a4ec Merge pull request #389 from jehiah/utility_useragents_389
8887ed0 smaller font for useragent
1aa94ca report tool name and version as UserAgent via go-nsq
5407069 bump go-nsq to include TLS config support
983cbb0 Merge pull request #383 from mreiferson/flakey_tests_383
d5dbe49 nsqlookupd: deflake TestTombstonedNodes
4f6554b nsqlookupd: deflake TestInactiveNodes
64deb5c nsqlookupd: deflake TestTombstoneRecover
aa74292 nsqd: deflake TestClientAttributes
dd58579 nsqd: quiet TestBadFin
d76ee4d nsqd: deflake TestSampling
c4c4cf8 nsqd: restore previous error message
6f49c37 nsqlookupd: fix race on PeerInfo.lastUpdate
f85596c Merge pull request #386 from jehiah/nsqadmin_auth_data_386
ab79582 expose Auth data in nsqadmin and client remote address
1d45d24 Merge pull request #385 from jehiah/empty_fin_385
25bc7e6 Check that message ID is valid size
3c1f0d8 Merge pull request #378 from mreiferson/channel_in_flight_cleanup_378
3cc898a run tests on go1.2.2 and go1.3
74bfde1 nsqd: refactor in flight pqueue / worker
e4e4fc0 Merge pull request #377 from mreiferson/remove_verbose_377
7a0e381 apps: cleanup unused --verbose flag
a6912ff Merge pull request #366 from mreiferson/http_updates_366
96644c0 nsqadmin: forwards/backwards compatible nsqd/nsqlookupd HTTP requests
0879476 nsqadmin: add helpers to query backwards compatible nsqd
77a70cd nsqd: add suite of HTTP tests; update others to negotiate
4f50135 util/lookupd: negotiate V1 response
05befbf nsqadmin: unexport graphiteGet
9e2daf3 util/lookupd: use net.JoinHostPort for correctness
d55fab9 util/lookupd: add GetVersion helper
a30a2fa nsqlookupd: update HTTP tests
8dff34d nsqd: refactor HTTP response formatting
41684ad nsqlookupd: provide versioned unwrapped response formats and consistent endpoint names
aa1fce9 util: add APIRequestNegotiateV1
3874ac2 util: return empty response instead of 'null'
91a6e48 util: more correct content type; add custom content type as return indicator
43d332c util: make some HTTP response code reusable
012c6b7 Merge pull request #370 from jehiah/lookup_authd_filter_370
3a12e5d sync with new go-nsq changes
3bb4026 bump go-nsq
afe53d0 fix specifying multiple auth servers; auth refactor
269cdb3 Merge pull request #356 from jehiah/nsqauthd_356
dc298af bump go-nsq to pickup auth support
a8776c3 nsqd auth protocol support
68c4088 Merge pull request #368 from sgeller/master
7072e57 modified bench.sh to support common benchmark configuration values
7dbe5e1 Merge pull request #365 from segmentio/nsqd/fix-msg_timeout
12663c2 nsqd: fix IDENTIFY msg_timeout response
3ee16a5 Merge pull request #360 from victorquinn/master
626ab9f Proudly add SocialRadar to the In Production list
0b5d51b Merge pull request #358 from svmehta/master
3d73933 increased allowable channel and topic name length
b32c14a Merge pull request #357 from mreiferson/go_nsq_bump_357
04dfbe8 nsqd: dont need intermediate inFlightMessage struct
42bb4ed nsqlookupd: dont depend on go-nsq
b11da3c nsqadmin: dont depend on go-nsq
81d997a bench: refactor for new go-nsq API
339262d nsqd: dont depend on go-nsq for non-client functions
9803e56 util: copy some methods from go-nsq
87b8882 apps: convert to new go-nsq API
57ee1c3 bump go-nsq to v1.0.0-alpha
d177752 Merge pull request #330 from mreiferson/http_refactor_330
adb1f27 nsqd: require post for mutating v1 HTTP endpoints
7ad4908 nsqd: HTTP versioning
c2ecf22 Merge pull request #352 from AlphaB/req_timeout_348
a32af8d nsqd: Make REQ timeout limit configurable
0457c28 Merge pull request #353 from AlekSi/patch-1
97818ed Fix typo
47ed257 Merge pull request #345 from wistia/master
ec787f4 nsq_to_file: Set proper permissions on new directories. Fixes #344.
3fe84f4 update doc links
6428e2d run travis against go1.2.1
b7e452c Merge pull request #340 from mreiferson/dep_bumps_340
b2b034a bump version 0.2.29-alpha
25086e4 bump perks
5e4aab4 bump go-nsq dep to v0.3.6 stable
e69bd11 Merge pull request #339 from mreiferson/bench_channels_339
9819a01 Merge pull request #338 from politician/feature/diskqueue-win32
6b5596d uses ; as a topic-channel separator on Windows
c9e7770 ChangeLog typos yay
253d95c bench_channels: benchmark many topics/channels
490dc88 missed some ChangeLog notes
048691a bump v0.2.28 stable
a8e8108 nsqd: os.Rename does not have rename(2) semantics on Win32
d5b462a nsqd: Windows file names cannot contain colons
9cca3e9 Merge pull request #337 from mreiferson/tls_client_cert_default_337
ee69554 nsqd: default TLS client auth type should be NoClientCert
abb66a8 Merge pull request #336 from bpmason1/patch-1
21afdbb correct spelling of "deprecated" in help info
fb54f4c more production users
8795d67 Merge pull request #334 from paddyforan/paddyforan_nsq_to_file_all_topics_final
6c817d7 Allow nsq_to_file to listen to many topics.
e14a2ac Merge pull request #329 from mreiferson/better_write_deadline_329
01f085a nsqd: set client write deadline to heartbeat interval
4d59aa5 go fmt
84da1ce update ChangeLog
735da2f bump go-nsq dep to 0.3.6-alpha
2be0dfb Merge pull request #327 from chrisroberts/feature/cert-auth
d2b51d4 nsqd: add `--tls-required` option to require TLS upgraded client connections
f5ef9ae nsqd: set timeout on tls handshake
f8c2b2d nsqd: add support for client SSL require and verify
7da2c17 Merge pull request #326 from mreiferson/bench_fixes_326
46cdd26 cleanup bench.sh
76b9dcb Merge pull request #325 from kzvezdarov/split-nsqd-app
4990096 Made nsqd into an importable package with the daemon program moved to apps/nsdq
1b894b3 bench.sh isn't rebuilding apps correctly; fix nsqd exit trap too
53b42d7 Merge pull request #324 from jehiah/nsq_stat_memory_depth_324
86301f7 display MemoryDepth and Depth
e3b15d7 add segment.io
a2ed4af Merge pull request #298 from mreiferson/identify_metadata_cleanup_298
4a1c562 nsqadmin: update client metadata
68b812b nsqd: improve IDENTIFY naming
6643acf nsqd: shouldnt panic here it's a client error
7de0950 Merge pull request #321 from mreiferson/bench_fixes_321
e307639 Merge pull request #319 from jsocol/nsq_to_file_create_paths
1c7b8d4 nsq_to_file: allow path separator in filenames
59c0755 bench: fix some minor issues
d7b776d add eventful
c0a902c add reonomy
2707810 add project fifo
f379322 add irc chan to README
419f9af bump 0.2.28-alpha
13fc313 Merge pull request #318 from mreiferson/refactor_identify_318
26323a1 nsqd: deflake TestInFlightWorker
d784e5c nsqd: deflake TestSampling
73b10d0 nsqd: refactor IDENTIFY test helpers
68b713a nsqd: add msg_timeout to IDENTIFY
7d6e0ce nsqd: refactor IDENTIFY
1a2cdaa Merge pull request #315 from mreiferson/test_sampling_data_race_315
ab590ce nsqd: add a bit of sleep for flakey HTTP pub tests
ebab1af nsqd: fix unsafe map Channel.clients access
4405e22 nsqd: fix TestSampling data race
ae772c4 docs: latest stable should point to releases page
35e4829 bump v0.2.27 stable
615fe88 Merge pull request #314 from mreiferson/cleanup_314
1f37fca run tests with GOMAXPROCS=4 and -race (if >go1.0)
e3cd704 nsqd: cleanup test races so we can run with -race
52f013a nsqd: tests should always use mustStartNSQD and /tmp data path
62a69b9 nsqd: s/max-message-size/max-msg-size for consistent naming
c85ebb9 pull go-options out into separate repo
7fcf4de apply goimports
dd0c11d nsqadmin: consistent naming
05353db Merge pull request #312 from mreiferson/test_flakiness_312
d625e6b nsqd: fix flakey TestClientAttributes
febe207 nsqd: cleanup TestClientAttributes
9df58f3 Merge pull request #311 from mreiferson/client_metadata_race_311
c1f1cd3 Merge pull request #309 from mreiferson/nsqadmin_node_del_bug_309
866da5e nsqd: fix race when get/set client metadata (test flakiness)
4ce6d9d nsqadmin: change tombstone direct link to form post on node page
72005cd Merge pull request #310 from mreiferson/nsqadmin_minor_bugs_310
8af239f nsqadmin: cleanup some E2E edge cases with no topics/channels/producers

git-subtree-dir: src/github.com/bitly/nsq
git-subtree-split: 1e7866e22e7eeeb689511592fe0d43eca5c47e09