931ae5fec3
Merge pull request #397 from philips/fixups-for-the-dashboard
...
Two dashboard fixups
2013-12-13 12:47:00 -08:00
bcf692d775
chore(mod/dashboard): rebuild to the latest version
2013-12-13 12:44:24 -08:00
7e5aa3137d
fix(server/registry): use url.Value.Encode()
...
Instead of open coding url encoding which lead to error, make it real
and use the library.
2013-12-13 12:43:01 -08:00
e24d2fdb6c
fix(mod/dashboard): fix after api changes
...
use node instead of kvs and value
2013-12-13 12:36:29 -08:00
fe80a868a0
Merge pull request #396 from ccding/master
...
gofmt for ./server ./test
2013-12-12 15:00:41 -08:00
468bfedf34
gofmt
2013-12-12 14:53:22 -08:00
5e1fdf554d
Merge pull request #389 from philips/document-ttl-directories
...
feat(README): add directory TTL documentation
2013-12-12 11:38:49 -08:00
d204fa8438
Merge pull request #394 from xiangli-cmu/fix_error_msg
...
fix(store.go) report node.path
2013-12-12 10:13:01 -08:00
dba5eb57cf
fix(store.go) report node.path
2013-12-12 10:12:33 -08:00
0399593589
Merge pull request #393 from xiangli-cmu/fix_index
...
fix(dispatch) should call e.Index()
2013-12-12 09:57:16 -08:00
36dda352d9
fix(dispatch) should call e.Index()
2013-12-12 09:56:28 -08:00
44f050f59a
Merge pull request #384 from benbjohnson/refactor-mod-lock
...
Refactor mod/lock.
2013-12-11 19:34:26 -08:00
3caf7745b6
2013-12-11 20:24:43 -07:00
c1508becd6
Merge pull request #390 from xiangli-cmu/fix_v1_index_inconsistence
...
fix index inconsistence in v1 api
2013-12-11 11:24:53 -08:00
a5bca025b1
fix index inconsistence in v1 api
2013-12-11 11:12:39 -08:00
bb64e7b6e5
feat(README): add directory TTL documentation
2013-12-11 10:47:00 -08:00
f66bd1689d
Merge pull request #387 from xiangli-cmu/fix_expire_notify
...
Fix expire notify
2013-12-11 10:23:53 -08:00
3e4f8a382e
fix TestV2WatchKeyInDir test
2013-12-11 10:19:16 -08:00
44b08fea62
Merge branch 'add-expire-dir-test' of https://github.com/philips/etcd into fix_expire_notify
2013-12-11 09:57:34 -08:00
74bd0d95b8
fix(server): try and add a expire dir test
...
This doesn't actually work yet.
2013-12-10 16:32:37 -08:00
f83e76eb60
Merge https://github.com/coreos/etcd into fix_expire_notify
2013-12-10 15:18:00 -08:00
06473ba6fe
fix(store.go) expire should also notify all the watchers under the path
2013-12-10 15:17:13 -08:00
cb9f677cf6
chore(server): cleanup some whitespace
2013-12-10 11:13:37 -08:00
9ea1ef8916
hack(travis): temporarily fix travis
...
try a quick workaround for https://github.com/travis-ci/travis-ci/issues/1727
2013-12-09 21:46:55 -08:00
dd354c9e22
Merge pull request #376 from xiangli-cmu/dir_flag
...
feat add dir_flag
2013-12-09 08:34:57 -08:00
59e98fcc62
doc fix grammar issue
2013-12-09 11:33:55 -05:00
4bec461db1
Refactor mod/lock.
2013-12-08 15:26:58 -07:00
8442e7a0dc
Timeout refactor.
2013-12-07 14:35:31 -07:00
aabd0faebe
Merge branch 'feature-parametric-timeout' of https://github.com/neildunbar/etcd into neildunbar-feature-parametric-timeout
2013-12-07 14:07:53 -07:00
31bc0bb670
Merge pull request #380 from bcwaldon/drop-prevValue
...
fix(v2): Drop prevValue from exported fields
2013-12-06 14:11:01 -08:00
0fb8fc0b8d
fix(v2): Drop prevValue from exported fields
2013-12-06 11:46:23 -08:00
a06f5e74af
Merge remote-tracking branch 'upstream/master' into feature-parametric-timeout
...
Conflicts:
Dockerfile
server/usage.go
tests/server_utils.go
2013-12-06 10:13:33 +00:00
5edaee79e6
Merge pull request #363 from xiangli-cmu/fix_consistent_redirection
...
fix redirect url should include rawquery
2013-12-05 20:33:56 -08:00
0762c79e2e
refactor remove unused const
2013-12-05 21:04:00 -05:00
d646d7c16a
tests add tests for dir flag
2013-12-05 20:46:52 -05:00
1a7eb36b6f
Merge pull request #372 from philips/bind-addr-ports
...
fix(server): override port of bind
2013-12-05 15:29:37 -08:00
9db521ca04
fix(server): override port of bind
...
Allow people to specify ports on the `-bind-addr` arguments so that they
can use randomly assigned port numbers in containers.
2013-12-05 15:29:25 -08:00
e00296960c
test fix tests
2013-12-05 18:16:01 -05:00
c305eda344
docs(delete_command.go) document about recursive implies dir
2013-12-05 17:52:32 -05:00
636dad190e
refactor(error.go) error messages
2013-12-05 17:50:20 -05:00
b556252358
tests fix all tests
2013-12-05 17:48:32 -05:00
4ba7d85d56
refactor(update) more clear dir checking
2013-12-05 17:16:44 -05:00
40d297be66
feat add dir_flag
2013-12-05 17:10:37 -05:00
d971d22849
Merge pull request #375 from philips/fix-reset
...
fix(etcd): Fix forced config reset
2013-12-05 13:26:57 -08:00
e7839e8c57
fix(etcd): Fix forced config reset
...
When a server name or a data directory were not provided, the
reset functionality would fail to clear out config files from
the appropriate place. This calcualtes the default server name
and data directory before reset is called.
2013-12-05 13:26:31 -08:00
af20be8123
Merge pull request #347 from benbjohnson/mod-lock
...
WIP: mod/lock
2013-12-05 10:59:32 -08:00
70e31c71f3
Merge pull request #371 from polvi/dockerfile
...
fix(Dockerfile): remove bogus -bind-addr, and use default -addr
2013-12-05 10:50:34 -08:00
b22c6fed4d
fix(Dockerfile): remove bogus -bind-addr, and use default -addr
2013-12-05 18:07:51 +00:00
0867b33de5
fix(Dockerfile): reverted unneeded changes
...
fix(server/config.go): ensured params are changeable from config file and env
fix(server/server.go): removed unnecessary debug line
fix(server/timeout.go): removed a commented block
style(server/transporter.go): put explicit vars to replace timeout expressions
style(tests/server_utils.go): ran gofmt to clean up indenting
2013-12-05 09:23:23 +00:00
b784ced517
Update mod/lock versioning.
2013-12-04 22:39:59 -07:00
