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
800 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Johnson
41e7266ff7 Merge branch '0.2' into config 
Conflicts:
	Documentation/external-documentation.md
	server/config.go
	server/config_test.go
	server/tls_info.go
	server/util.go
 2013-10-23 13:59:28 -06:00
Ben Johnson
f99d24310f Fix conf extension and documentation. 2013-10-23 13:44:53 -06:00
Ben Johnson
65663b2dae Merge branch '0.2' of https://github.com/coreos/etcd into 0.2 2013-10-22 13:09:26 -06:00
Ben Johnson
7d4908a6c3 Merge branch '0.2' of https://github.com/coreos/etcd into config 2013-10-21 21:38:58 -06:00
Ben Johnson
bc0e07bca2 Add tiered configuration. 2013-10-21 21:37:25 -06:00
Ben Johnson
48b3e7f2ab Add basic config. 2013-10-21 16:00:20 -06:00
Xiang Li
e8a7230a1d Merge pull request #264 from xiangli-cmu/0.2 
refactor remove extra print parameter
 2013-10-21 12:38:01 -07:00
Xiang Li
6803d077b9 fix store pacakge pass go vet 2013-10-21 12:37:22 -07:00
Xiang Li
94accfcb23 refactor remove extra print parameter 2013-10-21 12:35:02 -07:00
Xiang Li
90c5614cd4 Merge pull request #260 from benbjohnson/clean-store-tests 
Clean up store tests.
 2013-10-20 18:08:17 -07:00
Ben Johnson
23119d1672 Refactor store tests. 2013-10-20 16:09:45 -06:00
Xiang Li
f19567fd3e Merge pull request #259 from xiangli-cmu/0.2 
fix do not need to parse the original url
 2013-10-20 11:27:47 -07:00
Xiang Li
2cafdcd657 fix do not need to parse the original url 2013-10-20 11:27:40 -07:00
Ben Johnson
93bdce32a8 Merge pull request #258 from xiangli-cmu/0.2 
use net/url pacakge
 2013-10-20 11:25:44 -07:00
Xiang Li
1119a86cc3 fix add fragment 2013-10-20 11:25:24 -07:00
Xiang Li
5767b4e245 use net/url pacakge 2013-10-20 11:10:24 -07:00
Xiang Li
61f238f22e Merge pull request #255 from xiangli-cmu/0.2-fix-devlist-issue 
0.2 fix devlist issue
 2013-10-20 10:29:29 -07:00
Xiang Li
0cdb865b4c Merge pull request #256 from xiangli-cmu/0.2-refactor-status-code 
refactor return http status 201 Created when creating a new node
 2013-10-20 10:25:01 -07:00
Xiang Li
b852a746ce refactor move http status logic to server.go 2013-10-20 10:21:54 -07:00
Ben Johnson
8e12e4e480 Merge pull request #251 from benbjohnson/v2-handler-tests 
v2 Handler Unit Tests
 2013-10-20 10:12:44 -07:00
Xiang Li
acbc0c8846 refactor return http status 201 Created when creating a new node 2013-10-19 19:57:36 -07:00
Xiang Li
6684186033 fix append rawqurey to the redirect location. 2013-10-19 15:06:35 -07:00
Xiang Li
e931ff23d8 Merge branch '0.2' of https://github.com/coreos/etcd into 0.2-fix-devlist-issue 2013-10-19 11:52:47 -07:00
Xiang Li
7b6e305d40 fix update also return newValue 2013-10-19 11:51:41 -07:00
Ben Johnson
62b890839a Merge branch '0.2' of https://github.com/coreos/etcd into v2-handler-tests 
Conflicts:
	test.sh
 2013-10-18 08:54:51 -06:00
Xiang Li
97987e72a7 Merge pull request #250 from xiangli-cmu/0.2-fix-test 
fix use right gopath
 2013-10-17 21:12:38 -07:00
Xiang Li
a6f7069264 fix use right gopath 2013-10-17 20:57:00 -07:00
Xiang Li
58495d1dcf Merge pull request #249 from xiangli-cmu/0.2-fix-path 
fix bad cert path
 2013-10-17 20:54:15 -07:00
Xiang Li
4135f425d3 fix bad cert path 2013-10-17 20:53:30 -07:00
Ben Johnson
dcef04b796 Add v2 unit tests. 2013-10-17 21:52:15 -06:00
Xiang Li
2eff77ea92 Merge pull request #247 from xiangli-cmu/0.2-handlers 
fix v1 handler: use create command when test against prevexistence
 2013-10-17 20:37:16 -07:00
Xiang Li
87b2a0d9c5 fix remove unused package 2013-10-17 10:50:00 -07:00
Xiang Li
a0d3488d94 Merge branch '0.2' of https://github.com/coreos/etcd into 0.2-handlers 2013-10-17 10:46:01 -07:00
Ben Johnson
088a01f19c Merge pull request #248 from benbjohnson/build-fail 
Update build script to fail on error.
v0.2.0-rc0 		2013-10-17 09:27:22 -07:00
Ben Johnson
4fb3a01f25 Update build script to fail on error. 2013-10-17 10:02:59 -06:00
Xiang Li
4479d72e93 fix hmm... another stupid mistake 2013-10-17 00:12:39 -07:00
Xiang Li
28722e2127 fix v1 handler: use create command when test against prevexistence 2013-10-16 23:57:42 -07:00
Ben Johnson
7fa99b3794 Merge pull request #245 from benbjohnson/0.2 
Travis Fix
 2013-10-16 18:37:39 -07:00
Ben Johnson
c39f0963ae Merge branch '0.2' of https://github.com/coreos/etcd into 0.2 2013-10-16 19:36:38 -06:00
Brandon Philips
e0636ce655 Merge pull request #242 from philips/add-version-flag-0.2 
feat(etcd): add version flag
 2013-10-16 17:33:35 -07:00
Brandon Philips
7670c85d70 feat(server): export ReleaseVersion 
releaseVersion is needed in etcd.go to print it out in the -version
flag.
 2013-10-16 17:29:53 -07:00
Brandon Philips
f998a19c3d feat(etcd): add version flag 
print the version and exit, very simple :)

Conflicts:
	etcd.go
 2013-10-16 17:29:53 -07:00
Ben Johnson
bc8c338bed Travis fix. 2013-10-16 15:23:11 -06:00
Ben Johnson
66becddac3 Merge pull request #243 from benbjohnson/reintegrate-functional-tests 
Reintegrate functional tests into etcd.
 2013-10-16 14:13:21 -07:00
Ben Johnson
b4d311d6a1 Reintegrate functional tests into etcd. 2013-10-16 13:58:03 -06:00
Xiang Li
f5fa89c0e1 Merge pull request #238 from xiangli-cmu/0.2-handlers 
0.2 handlers
 2013-10-16 10:56:39 -07:00
Xiang Li
e680f28c2f fix move update check to update handler 2013-10-15 23:25:12 -07:00
Xiang Li
0392c18794 refactor put_handler.go 2013-10-15 23:18:03 -07:00
Xiang Li
baa683b484 feat POST-create unique node under given path 2013-10-15 22:21:55 -07:00
Xiang Li
01bbad31c7 refactor remove web pacakge 2013-10-14 23:16:48 -07:00