update git workflow
Merge pull request #45 from tobstar87/rangeaccess

add store access interface to ranges
Rename InternalRangeScan to InternalSnapshotCopy. This eliminates some
confusion between scanning as with MVCC and doing a raw scan of engine
contents. The "snapshot copy" gives a much better idea of the proper use
and limits of this RPC.
Remove joint consensus (ProposedMembers) support.

This was present in the original raft paper but was removed from the final
thesis because simpler protections suffice as long as only one node is added
or removed at a time.

Use the term "observer" consistently for non-voting members.
Merge pull request #46 from cockroachdb/spencerkimball/rename-internal-range-scan

Rename InternalRangeScan to InternalSnapshotCopy.
Merge branch 'raft'

* raft:
  Remove joint consensus (ProposedMembers) support.
add weighted reservoir sampling (AE-S)

address feedback from @spencerkimball

final commit before merge
Merge pull request #44 from tobstar87/split

add weighted reservoir sampling (AE-S)
Fix filenames in log files.

The indirection here was causing all log lines to be reported as "log.go".
Using the glog functions more directly lets the original filename through,
at the expense of customizability.  When we make the changes that motivated
the introduction of the log package, we'll need to either revert this or
come up with another solution to preserve the caller's file/line info.
Merge pull request #48 from cockroachdb/log

Fix filenames in log files.
Also make log.V an alias for glog.V.

I left this out of my initial commit because it's more complicated
but this turns out to be necessary for --vmodule.
address feedback