Chris Lu 41bd5179f3 Resolve Conflicts

2015-01-14 09:56:13 -08:00

..

allocate_volume.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

cluster_commands.go

use github.com/chrislusf instead of github.com/aszxqw

2014-09-25 16:57:22 +08:00

collection.go

add some String() to make codes easier to read and debug

2015-01-08 15:54:50 +08:00

configuration_test.go

Cleanup error printing.

2015-01-13 17:04:41 -08:00

configuration.go

1. refactoring, merge "replication" logic into "topology" package

2014-04-13 01:29:52 -07:00

data_center.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

data_node.go

add some String() to make codes easier to read and debug

2015-01-08 15:54:50 +08:00

node.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

rack.go

Major:

2014-03-02 22:16:54 -08:00

store_replicate.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

topo_test.go

fix old tests that's found not working during travis integration.

2014-07-20 23:41:25 -07:00

topology_event_handling.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

topology_map.go

Add read-write lock to guard topology changes on new collections and ttls.

2014-12-08 20:29:25 -08:00

topology_vacuum.go

Add read-write lock to guard topology changes on new collections and ttls.

2014-12-08 20:29:25 -08:00

topology.go

fix some typos

2015-01-13 18:46:56 +08:00

volume_growth_test.go

formatting code by: goimports -w=true .

2014-10-26 11:34:55 -07:00

volume_growth.go

Cleanup error printing.

2015-01-13 17:04:41 -08:00

volume_layout.go

add some String() to make codes easier to read and debug

2015-01-08 15:54:50 +08:00

volume_location_list.go

add some String() to make codes easier to read and debug

2015-01-08 15:54:50 +08:00