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

Merge branch '0.2' of https://github.com/coreos/etcd into versioning

Browse Source 
Conflicts:
	server/v2/put_handler.go
This commit is contained in:
Ben Johnson
2013-10-28 06:39:56 -06:00
parent aa9ae32998 bd0d2e8494
commit 23dc0b9317
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/v2/put_handler.go
View File

@@ -71,7 +71,7 @@ func PutHandler(w http.ResponseWriter, req *http.Request, s Server) error {
}
}
c = s.Store().CommandFactory().CreateCompareAndSwapCommand(key, value, prevValue, prevIndex, store.Permanent)
c = s.Store().CommandFactory().CreateCompareAndSwapCommand(key, value, prevValue, prevIndex, expireTime)
return s.Dispatch(c, w, req)
}