5 Commits

Author SHA1 Message Date
Xiang Li
9ebdcb8ae3 refactor change testAndSet to CompareAndSwap 2013-10-14 22:32:22 -07:00
Ben Johnson
6b55a47090 bump(github.com/coreos/go-systemd): af0e6cd015e5fad8d9d090ad7aa343a1f680318d 2013-10-14 10:05:43 -06:00
Xiang Li
2c9d57a9fe fix conflicts 2013-09-28 17:05:00 -07:00
Xiang Li
784d286f37 merge from master 2013-09-28 16:58:57 -07:00
David Fisher
951d467917 Swith to coreos/go-log from ccding/go-logging
bump(github.com/coreos/go-etcd): 57864cf81c66b8605816fafab3ab142e1c5f5b29
bump(github.com/coreos/go-log/log):
bump(github.com/coreos/go-systemd): 52f153170a52158deffce83502a9b6aed3744802
2013-09-25 13:32:51 -07:00