Chris Lu f7998f8652 merge conflicts

2015-02-07 15:35:28 -08:00

..

cdb_map_test.go

formatting code by: goimports -w=true .

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

cdb_map.go

Cleanup error printing.

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

compact_map_perf_test.go

formatting code by: goimports -w=true .

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

compact_map_test.go

add test case for issue 52

2013-10-31 12:55:51 -07:00

compact_map.go

formatting code by: goimports -w=true .

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

compress.go

formatting code by: goimports -w=true .

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

crc.go

formatting code by: goimports -w=true .

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

file_id.go

formatting code by: goimports -w=true .

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

needle_map.go

Cleanup error printing.

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

needle_read_write.go

Resolve Conflicts

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

needle.go

fix the #59 and #56

2015-01-16 17:30:23 +08:00

replica_placement_test.go

fix bug when reading back the replica settings!

2014-04-13 03:06:15 -07:00

replica_placement.go

add TTL support

2014-09-20 12:38:59 -07:00

store_vacuum.go

formatting code by: goimports -w=true .

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

store.go

merge conflicts

2015-02-07 15:35:28 -08:00

volume_id.go

testing compilation with remove package

2013-02-10 03:49:51 -08:00

volume_info.go

Cleanup error printing.

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

volume_super_block_test.go

add TTL support

2014-09-20 12:38:59 -07:00

volume_super_block.go

Cleanup error printing.

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

volume_ttl_test.go

Adding unit tests for volume ttl.

2014-09-20 20:51:24 -07:00

volume_ttl.go

Adding unit tests for volume ttl.

2014-09-20 20:51:24 -07:00

volume_vacuum.go

formatting code by: goimports -w=true .

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

volume_version.go

formatting code by: goimports -w=true .

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

volume.go

Resolve Conflicts

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