Compare commits
merge into: greg:master
greg:master
greg:slf/hc-demo-env
greg:slf/doc-cluster-terminology
greg:mra/merkle-exchange
greg:ss/flu1-factorization3
greg:slf/flu-config-rcd-style
greg:slf/doc-201512-update
greg:ku/single-leveldb-instance
greg:slf/doc-name-game2
greg:gh-pages
greg:bugfix/52
greg:mra/merkle-cleanup
greg:mra/merkle-bench
greg:tmp/ss/filename-mgr-reuse-fix
greg:ss-repair-with-partition-simulator-patched
greg:slf/doc-cleanup2
greg:slf/merkle-bench-ugly-hack
greg:slf/merkle-trees-exp
greg:mra/merklet
greg:mra/merkle-trees
greg:slf/dialyzer1
greg:slf/doc-name-game
greg:slf/travis-ci2
greg:slf/eunit-verbose-cleanup
greg:slf/travis-ci
greg:mra/write-once-clean
greg:bug/from-bp-request-error
greg:slf/cp-mode-cr-client
greg:mra/wip-1
greg:mra/write-once
greg:slf/cp-mode-adjustments
greg:slf/cp-mode-adjustments.hrm-perhaps1
greg:slf/tmp/merge0920
greg:slf/chain-manager/remove-inner
greg:slf/chain-manager/cp-mode4
greg:slf/chain-manager/cp-mode3
greg:slf/projection-conditional-write
greg:slf/chain-manager/cp-mode2
greg:slf/chain-manager/cp-mode
greg:slf/flu-cleanup1
greg:slf/pb-api-experiment3
greg:slf/pb-api-experiment2
greg:slf/pb-api-experiment1
greg:slf/doc-cleanup1
greg:slf/chmgr-model-overhaul
greg:slf/checksum-typing
greg:slf/client-side-chain-replication
greg:slf/chain-repair
greg:slf/otp-refactoring-step4
greg:doc/machi-high-level-design-port
greg:slf/projection-browser
greg:slf/otp-refactoring-step3
greg:slf/otp-refactoring-step2
greg:slf/otp-refactoring-step1
greg:slf/chain-manager/async-partition-mitigation-exp3b
greg:slf/chain-manager/async-partition-mitigation-exp3
greg:slf/chain-manager/async-partition-mitigation
greg:slf/chain-manager/async-partition-mitigation-unfinished-work
...
pull from: greg:mra/merkle-cleanup
greg:master
greg:slf/hc-demo-env
greg:slf/doc-cluster-terminology
greg:mra/merkle-exchange
greg:ss/flu1-factorization3
greg:slf/flu-config-rcd-style
greg:slf/doc-201512-update
greg:ku/single-leveldb-instance
greg:slf/doc-name-game2
greg:gh-pages
greg:bugfix/52
greg:mra/merkle-cleanup
greg:mra/merkle-bench
greg:tmp/ss/filename-mgr-reuse-fix
greg:ss-repair-with-partition-simulator-patched
greg:slf/doc-cleanup2
greg:slf/merkle-bench-ugly-hack
greg:slf/merkle-trees-exp
greg:mra/merklet
greg:mra/merkle-trees
greg:slf/dialyzer1
greg:slf/doc-name-game
greg:slf/travis-ci2
greg:slf/eunit-verbose-cleanup
greg:slf/travis-ci
greg:mra/write-once-clean
greg:bug/from-bp-request-error
greg:slf/cp-mode-cr-client
greg:mra/wip-1
greg:mra/write-once
greg:slf/cp-mode-adjustments
greg:slf/cp-mode-adjustments.hrm-perhaps1
greg:slf/tmp/merge0920
greg:slf/chain-manager/remove-inner
greg:slf/chain-manager/cp-mode4
greg:slf/chain-manager/cp-mode3
greg:slf/projection-conditional-write
greg:slf/chain-manager/cp-mode2
greg:slf/chain-manager/cp-mode
greg:slf/flu-cleanup1
greg:slf/pb-api-experiment3
greg:slf/pb-api-experiment2
greg:slf/pb-api-experiment1
greg:slf/doc-cleanup1
greg:slf/chmgr-model-overhaul
greg:slf/checksum-typing
greg:slf/client-side-chain-replication
greg:slf/chain-repair
greg:slf/otp-refactoring-step4
greg:doc/machi-high-level-design-port
greg:slf/projection-browser
greg:slf/otp-refactoring-step3
greg:slf/otp-refactoring-step2
greg:slf/otp-refactoring-step1
greg:slf/chain-manager/async-partition-mitigation-exp3b
greg:slf/chain-manager/async-partition-mitigation-exp3
greg:slf/chain-manager/async-partition-mitigation
greg:slf/chain-manager/async-partition-mitigation-unfinished-work
These branches are equal. There is no need to create a pull request.