Xiang Li
4f47a6ebfb
Merge pull request #3032 from xiang90/refactor_update_role
...
auth: refactor updateRole
2015-06-23 11:17:45 -07:00
Xiang Li
240e121792
Merge pull request #3039 from xiang90/update_auth
...
doc: update auth_api.md
2015-06-23 11:12:47 -07:00
Xiang Li
aaf802f321
doc: update auth_api.md
2015-06-23 11:08:04 -07:00
Xiang Li
ad7124599d
Merge pull request #3033 from barakmich/strip_pass
...
etcdhttp: Always strip password hash when returning users
2015-06-22 18:39:50 -07:00
Xiang Li
7f7e2cc79d
Merge pull request #3034 from philips/replace-maximal-with-maximum
...
*: docs and code %s%maximal%maximum%g
2015-06-22 16:24:01 -07:00
Brandon Philips
740187f199
*: docs and code %s%maximal%maximum%g
...
maximum is a more common word, use it instead
2015-06-22 16:06:57 -07:00
Yicheng Qin
028a1d6dd4
Merge pull request #2994 from webner/feature/cancel-proxy-request
...
proxy: handle canceled proxy request gracefully
2015-06-22 16:06:05 -07:00
Barak Michener
d5a0e3ac6a
etcdhttp: Always strip password hash when returning users
2015-06-22 18:39:16 -04:00
Xiang Li
979f531261
auth: refactor updateRole
...
We will return error if revoke or grant fails to update the role.
No need to check if revoke or grant is nil or not.
2015-06-22 15:16:10 -07:00
Xiang Li
462baedcd4
Merge pull request #3031 from xiang90/fix_auth
...
auth: do not allow to grant duplicate role or revoke ungranted role
2015-06-22 15:13:26 -07:00
Xiang Li
3f82e7b116
auth: do not allow to grant duplicate role or revoke ungranted role to a user
2015-06-22 15:11:09 -07:00
Barak Michener
51a65599dd
Merge pull request #3021 from xiang90/auth_err
...
etcdserver: use correct http status code for auth error
2015-06-22 14:58:33 -04:00
Xiang Li
c39aad0e92
etcdserver: use correct http status code for auth error
2015-06-22 09:28:47 -07:00
Xiang Li
3e4479b0cd
Merge pull request #3022 from xiang90/aut_type
...
etcdhttp: fix the response type for auth
2015-06-21 15:06:35 -07:00
Xiang Li
ebd4102578
Merge pull request #3026 from xiang90/better_logging
...
etcdserver: better log message for url mismatch
2015-06-19 19:39:33 -07:00
Xiang Li
d295d21349
etcdserver: better log message for url mismatch
2015-06-19 19:36:26 -07:00
Xiang Li
cad757efa0
etcdhttp: fix the response type for auth
2015-06-19 15:19:00 -07:00
Xiang Li
b26b827780
Merge pull request #3020 from xiang90/auth_doc
...
auth: minor fix for user section
2015-06-19 15:08:51 -07:00
Xiang Li
b1dbab2b6b
auth: minor fix for user section
2015-06-19 14:30:04 -07:00
Xiang Li
9f984ea6ae
Merge pull request #3015 from xiang90/auth_doc
...
doc: move enable section to the top in auth_api.md
2015-06-19 14:13:19 -07:00
Xiang Li
4f0f57b322
doc: move enable section to the top in auth_api.md
2015-06-19 14:08:29 -07:00
Brandon Philips
7ee4fb6181
Merge pull request #3011 from philips/fixup-discovery-info-output
...
discovery: fixup logline
2015-06-19 13:25:08 -04:00
Brandon Philips
e71dc2e565
discovery: fixup logline
...
before:
```
discovery: duringcluster status checkconnection tohttps://discovery.etcd.iotimed out, retrying in2s
```
after:
```
discovery: cluster status check: connection to https://discovery.etcd.io timed out, retrying in 2s
```
2015-06-19 13:19:09 -04:00
Wolfgang Ebner
a6e6186477
proxy: always set requestClosed flag when client closes the connection prematurely
2015-06-19 08:45:45 +02:00
Yicheng Qin
5787fabe5f
Merge pull request #3008 from yichengq/storage-index-test
...
storage: add range and tombstone test for index
2015-06-18 19:29:31 -07:00
Yicheng Qin
b20598eea0
storage: add range and tombstone test for index
2015-06-18 18:05:37 -07:00
Xiang Li
1a7a5fd45d
Merge pull request #3006 from yichengq/storage-kvstore-test
...
storage: remove unnecessary ForceCommit in kvstore.Close
2015-06-18 13:57:27 -07:00
Yicheng Qin
9f2e4c8a57
storage: remove unnecessary ForceCommit in kvstore.Close
...
s.b.Close will commit pending ops, so there is no need to FroceCommit
it in kvstore.Close()
2015-06-18 13:36:23 -07:00
Yicheng Qin
789e2f3426
Merge pull request #3003 from yichengq/storage-kvstore-test
...
storage: add restore test and fix some bug
2015-06-18 12:19:05 -07:00
Yicheng Qin
7cba42fb73
storage: wait for compact goroutine to exit before close backend
...
If backend is closed, the operations on backend in compact
goroutine will panic. So this PR waits for compact goroutine to exit
before close backend.
This fixes the TestWorkflow failure too.
2015-06-18 12:18:39 -07:00
Wolfgang Ebner
5e31854afd
proxy: use atomic operations for requestCanceled flag
2015-06-18 20:56:28 +02:00
Wolfgang Ebner
864ce5f946
proxy: handle canceled proxy request gracefully
...
when a client of the proxy server cancels a request the proxy should not
set the endpoint state to unavailable
2015-06-18 20:52:52 +02:00
Yicheng Qin
148394f66f
storage: fix schedule compaction bug in recover process
...
It uses wrong schedule compaction reversion before.
2015-06-18 11:11:37 -07:00
Yicheng Qin
26a09d8479
storage: enhance TestRestore and kill TODO
2015-06-18 10:37:12 -07:00
Yicheng Qin
0ef53ee500
Merge pull request #2999 from yichengq/storage-rev-test
...
storage: add reversion test
2015-06-18 07:39:18 -07:00
Yicheng Qin
74fbf9d6a7
storage: add reversion test
2015-06-17 18:06:42 -07:00
Yicheng Qin
06ca914429
Merge pull request #2998 from yichengq/storage-kvstore-test
...
storage: add kv range test
2015-06-17 17:49:55 -07:00
Yicheng Qin
80a59f00b7
storage: fix limit mismatch in Range func
2015-06-17 17:43:08 -07:00
Yicheng Qin
93f477944b
storage: return ErrFutureRev if rev is a future one
2015-06-17 17:42:43 -07:00
Yicheng Qin
94924d04db
storage: add TestRangeBadRev
2015-06-17 16:22:28 -07:00
Yicheng Qin
9ad5e1e64f
storage: kill TODO in TestRange
2015-06-17 15:58:28 -07:00
Yicheng Qin
05228729a3
Merge pull request #2996 from yichengq/storage-workflow-test
...
storage: add TestWorkflow
2015-06-17 15:05:12 -07:00
Yicheng Qin
500894dfe5
storage: add TestWorkflow
2015-06-17 14:38:21 -07:00
Yicheng Qin
7b1a93e1ef
storage: put storage info keys into information bucket
...
They used to be in key bucket, and make recover failed because they
cannot be parsed as normal key.
2015-06-17 14:37:29 -07:00
Yicheng Qin
d0f6432b51
*: bump to v2.1.0-alpha.1+git
2015-06-16 22:02:00 -07:00
Yicheng Qin
c4a5088bbc
*: bump to v2.1.0-alpha.1
2015-06-16 22:00:17 -07:00
Xiang Li
2efbc76689
Merge pull request #2993 from xiang90/md
...
doc: add doc for metrics feature
2015-06-16 14:22:16 -07:00
Xiang Li
c599e81d46
doc: add proposal into glossary.md
2015-06-16 14:19:18 -07:00
Xiang Li
5c1d4544fc
doc: add doc for metrics feature
2015-06-16 14:18:22 -07:00
Barak Michener
cdcae2d6a5
Merge pull request #2991 from barakmich/security_rename
...
*: Rename `security` to `auth`
2015-06-16 14:41:34 -04:00
