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

Conflicts:
	server/v2/put_handler.go

server/v2/put_handler.go

@@ -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)
 }
 

store/node.go

@@ -372,8 +372,8 @@ func (n *Node) UpdateTTL(expireTime time.Time) {
 		}
 	}
 
+	n.ExpireTime = expireTime
 	if expireTime.Sub(Permanent) != 0 {
-		n.ExpireTime = expireTime
 		n.Expire()
 	}
 }