Merge branch 'master' into work

This commit is contained in:
travisturner 2014-01-08 09:16:14 -06:00
commit 260a8d168e

View file

@ -1,6 +1,7 @@
package index
import (
"encoding/gob"
"errors"
"log"
. "pilosa/util"
@ -19,6 +20,11 @@ func NewFragmentContainer() *FragmentContainer {
type BitmapHandle uint64
func init() {
var vh BitmapHandle
gob.Register(vh)
}
func (self *FragmentContainer) GetFragment(frag_id SUUID) (*Fragment, bool) {
//lock
c, v := self.fragments[frag_id]