Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,233 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

6233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gyu-Ho Lee
e16f81838b etcdhttp/auth: BasicAuth method in standard pkg 
I created a new PR from https://github.com/coreos/etcd/pull/3598.
This is for `TODO: use the standard lib BasicAuth method when we move to
Go 1.4.` [1]. `BasicAuth` method got into Go standard package a year ago. [2]

---
1. https://github.com/coreos/etcd/blob/master/pkg/netutil/netutil.go#L126-L138
2. https://codereview.appspot.com/76540043/
 2015-09-28 14:02:55 -07:00
Yicheng Qin
7410698761 Merge pull request #3530 from mitake/etcdctl-timeout-v2 
etcdctl: use user specified timeout value for entire command execution
 2015-09-28 09:45:02 -07:00
Hitoshi Mitake
8ebc933111 etcdctl: use user specified timeout value for entire command execution 
etcdctl should be capable to use a user specified timeout value for
total command execution, not only per request timeout. This commit
adds a new option --total-timeout to the command. The value passed via
this option is used as a timeout value of entire command execution.

Fixes coreos#3517
 2015-09-28 10:31:46 +09:00
Rob Szumski
c645ac23c0 docs: fix link 2015-09-26 17:43:33 -07:00
Xiang Li
49d52eaf1e Merge pull request #3596 from xiang90/json_header 
etcdhttp: add Content-Type: application/json header to version handler
 2015-09-25 15:27:29 -07:00
Xiang Li
1226838381 etcdhttp: add Content-Type: application/json header to version handler 2015-09-25 15:14:13 -07:00
Xiang Li
c9be719d92 Merge pull request #3579 from gyuho/etcdserver/etcdhttp/httptypes/errors.go-WriteTo-returns-error 
httptypes: WriteTo to return error
 2015-09-25 14:31:48 -07:00
Yicheng Qin
93edabf85f Merge pull request #3594 from yichengq/exit 
etcdmain: exit after print out ErrDuplicateID
 2015-09-25 14:28:45 -07:00
Yicheng Qin
dc9a75df1c etcdmain: exit after print out ErrDuplicateID 
etcd should exit after printing log for unhandlable error.
 2015-09-25 14:10:50 -07:00
Xiang Li
60a641762b Merge pull request #3593 from xiang90/fix_race 
pkg/transport: fix a data race in TestWriteReadTimeoutListener
 2015-09-25 10:16:17 -07:00
Xiang Li
5d033c22af pkg/transport: fix a data race in TestWriteReadTimeoutListener 2015-09-25 10:02:37 -07:00
Yicheng Qin
dff702b2b8 Merge pull request #3564 from gouyang/master 
Improve proxy log for retrying an unavailable endpoint
 2015-09-25 10:02:15 -07:00
Gyu-Ho Lee
85f4475f62 httptypes/errors: HTTPError.WriteTo returns error 
Squashing all commits into this one
(from https://github.com/coreos/etcd/pull/357).

Thanks,
 2015-09-25 08:06:26 -07:00
Guohua ouyang
e35eeeae42 proxy: improve log for retrying an unavailable endpoint 
Fixes #3541

Signed-off-by: Guohua ouyang <guohuaouyang@gmail.com>
 2015-09-25 07:36:49 +08:00
Xiang Li
9de7f24301 Merge pull request #3554 from mitake/reconfig-doc 
doc: add a description of -strict-reconfig-check
 2015-09-24 08:07:32 -07:00
Hitoshi Mitake
78791f81a6 doc: add a description of -strict-reconfig-check 2015-09-24 11:44:55 +09:00
Xiang Li
0813a0f2d1 Merge pull request #3585 from xiang90/fix_hash 
storage: fix hash by iterating kv
 2015-09-23 11:39:21 -07:00
Xiang Li
385e17583f storage: fix hash by iterating kv 2015-09-23 11:28:33 -07:00
Xiang Li
370ce37d32 Merge pull request #3584 from mickep76/master 
docs/libraries-and-tools: add etcd-export tool
 2015-09-23 09:32:35 -07:00
Michael Persson
c1db1338c9 docs/libraries-and-tools: add etcd-export tool 2015-09-23 18:29:11 +02:00
Yicheng Qin
d6db4e6d6b Merge pull request #3577 from gyuho/storage/watchable_store.go-defer-fix 
storage/watchable_store: defer to Unlock s.mu
 2015-09-23 07:37:29 -07:00
Gyu-Ho Lee
4113509828 storage/watchable_store: defer to Unlock s.mu 
New PR from https://github.com/coreos/etcd/pull/3575.
This add `defer` to `s.mu`. Current code does not `Unlock`
in the correct scope, I think.

(Sorry, I accidentally deleted my fork so the changes
might not sound continuous from my previous pull requests.)
 2015-09-22 23:25:07 -07:00
Xiang Li
89acdd6245 Merge pull request #3555 from xiang90/proxy_doc 
doc: add proxy promotion doc
 2015-09-22 12:59:40 -07:00
Yicheng Qin
932bb76cbb Merge pull request #3570 from yichengq/extend-timeout 
integration: extend request timeout
 2015-09-22 10:17:13 -07:00
Xiang Li
eba8a2ed90 Merge pull request #3566 from xiang90/error_msg 
etcdsever: mismatch error uses the same format as the corresponding flag
 2015-09-22 07:41:46 -07:00
Xiang Li
13cfb4284f Merge pull request #3573 from TheHippo/patch-1 
docs/security: fixed command typo
 2015-09-22 07:41:30 -07:00
Xiang Li
2540a3fb7e etcdsever: mismatch error uses the same format as the corresponding flags 2015-09-21 19:32:10 -07:00
Philipp Klose
94f3297299
docs/security: fixed command typo 
`-peer-client-cert-atuh` should be `-peer-client-cert-auth`
 2015-09-22 03:39:29 +02:00
Yicheng Qin
305a0d7ab9 integration: extend request timeout 
Extend request timeout to give etcd cluster enough time to return
response.
 2015-09-21 16:50:22 -07:00
Xiang Li
ea3dbfed60 Merge pull request #3408 from MSamman/extend-auth-api 
etcdserver: extend auth api
 2015-09-21 11:51:19 -07:00
Xiang Li
999b2c6ec2 doc: add proxy promotion doc 2015-09-21 11:47:37 -07:00
Xiang Li
6188933c81 Merge pull request #3556 from xiang90/better_error_logging 
etcdmain: better logging when user forget to set initial flags
 2015-09-21 10:52:34 -07:00
Xiang Li
3b70bf87c3 etcdmain: better logging when user forget to set initial flags 2015-09-21 10:43:26 -07:00
Xiang Li
574d1b0d46 Merge pull request #3563 from dnaeon/fixes 
Fix etcd/client API example
 2015-09-21 10:06:41 -07:00
Marin Atanasov Nikolov
d6459b8b84 client: Fix API example 2015-09-21 19:51:29 +03:00
Mohammad Samman
6ae1f6c6e4 etcdserver: extend auth api 
allow recursive query on users and roles to get more detail

Fixes #3278
 2015-09-21 00:51:18 -07:00
Yicheng Qin
f3d2b5831c Merge pull request #3558 from yichengq/watch 
storage: add tests for RangeEvents and its underlying functions
 2015-09-20 23:58:41 -07:00
Xiang Li
cbddb8670a Merge pull request #3561 from ceh/raft-doc-typo 
raft: fix Node doc typo
 2015-09-20 21:52:34 -07:00
Emil Hessman
b9f22cb69b raft: fix Node doc typo 2015-09-21 06:13:33 +02:00
Yicheng Qin
d72914c36f storage: clarify comment for store.RangeEvents and fix related bugs 
Change to the function:
1. specify the meaning of startRev and endRev parameters
2. specify the meaning of returned nextRev

Moreover, it adds unit tests for the function.
 2015-09-19 23:17:03 -07:00
Yicheng Qin
5709b66dfb storage: add unit test for index.RangeEvents 2015-09-19 23:08:24 -07:00
Yicheng Qin
87b5143b15 storage: fix missing continue in keyIndex.since 
It should continue to skip following operations.

The test from rev14 to rev0 fails if it doesn't call continue and append
all revisions of the same main rev to the list.
 2015-09-19 23:01:18 -07:00
Yicheng Qin
158d6e0e03 storage: fix calculating generation in keyIndex.since 
It should skip last empty generation when the key is just tombstoned.

The rev15 and rev16 in the test fails if it doesn't skip last empty generation
and find previous generations.
 2015-09-19 22:58:45 -07:00
Xiang Li
06180be154 Merge pull request #3533 from xiang90/proxy 
proxy: expose proxy configuration
 2015-09-18 14:18:06 -07:00
Xiang Li
ac29432aab proxy: add a test for configHandler 2015-09-18 13:43:54 -07:00
Xiang Li
0f9b2046ef Merge pull request #3547 from bdarnell/multinode-node-ids 
raft: Allow per-group nodeIDs in MultiNode.
 2015-09-18 13:29:07 -07:00
Ben Darnell
b7baaa6bc8 raft: Allow per-group nodeIDs in MultiNode. 
This feature is motivated by
https://github.com/cockroachdb/cockroach/blob/master/docs/RFCS/replica_tombstone.md
which requires a change to the way CockroachDB constructs its node IDs.
 2015-09-18 15:36:36 -04:00
Yicheng Qin
be80d11948 storage: enhance test for keyIndex.Get and keyIndex.Compact 
It covers the case that one key is set multiple times in one main
revision now.
 2015-09-17 18:26:17 -07:00
Yicheng Qin
cedad49dcf Merge pull request #3543 from mitake/reconfig-remove 
etcdserver: forbid removing started member if quorum cannot be preserved in strict reconfig mode
 2015-09-17 18:22:53 -07:00
Hitoshi Mitake
f8859a980d etcdserver: forbid removing started member if quorum cannot be preserved in strict reconfig mode 
Like the commit 6974fc63ed87, this commit lets etcdserver forbid
removing started member if quorum cannot be preserved after
reconfiguration if the option -strict-reconfig-check is passed to
etcd. The removal can cause deadlock if unstarted members have wrong
peer URLs.
 2015-09-18 10:09:57 +09:00