gist

gistfile1.txt

*   78846365 - (HEAD) Merge pull request #1419 from LeoHChen/master_merge_from_r3 (5 days ago) <Dennis JongHyuck Won>
|\  
| * 92171da5 - [log] replace old log with zerolog (5 days ago) <Leo Chen>
| * 7bd399fe - [test] fix go test failure (5 days ago) <Leo Chen>
| *   a9a0e76f - [merge] merge r3-20190822.0 to master (6 days ago) <Leo Chen>
| |\  
| | *   acbe3d9a - (tag: r3-20190822.0) Merge pull request #1407 from xChickens/cp_wallet_ini_r3 (7 days ago) <Christopher Liu>
| | |\  
| | | * 5ab241bf - [Pangaea] Fix wallet_stress gogenerate error (7 days ago) <Chris>
| | | * 9f358eb3 - [Pangaea] Update wallet.ini bootnodes (#1406) (7 days ago) <Christopher Liu>
| | |/  
| | *   d5dbf842 - (r3) Merge pull request #1373 from charleszqwang/bingo (9 days ago) <Leo Chen>

Master is fine until * 6a18b040 - (HEAD) Fix crashes problems and remove temp crosslinks (7 days ago)

• 6a18b040 - (HEAD) Fix crashes problems and remove temp crosslinks (7 days ago)
  |\
  | * 59d1a174 - (harmony-one/cross-shard) Merge pull request #1402 from harmony-one/cross-shard-chao (7 days ago)
  | |\
  | | * e3bcc88e - improve log and syncing loop cpu 100% issue (7 days ago)
  | | * 261acf85 - fix incomingReceipts storage; cherry pick from RJ's branch (7 days ago)
• | | 964a7671 - Fix incomingReceipts storage and some build failure (7 days ago)
• | | cff71b33 - merge (7 days ago)
  |\ \ \
  | | |/
  | |/|
  | * | 7f62c8e5 - add crosslink verification for shardID=0 case (7 days ago)
• | | 2406442f - Fix beacon sync (7 days ago)
• | | 3d73207e - Merge branch 'cross-shard-chao' of github.com:harmony-one/harmony into HEAD (7 days ago)
  |\ \ \
  | * | | 99b6e5f4 - add crosslink verification for shardID=0 case (7 days ago)
  | |/ /
• | | 5eaeba16 - add crosslink verification for shardID=0 case (8 days ago)
  |/ /
• | 68b7c7c4 - add crosslink verification (8 days ago)
  |/
• d48e1472 - Merge pull request #1403 from rlan35/state-sync-sig-validation (8 days ago)
  |\
  | * af6cb79d - Add state sync sig validation and fix travis test (8 days ago)
  |/
• 2bb0a709 - Merge pull request #1389 from harmony-one/cross-shard-chao (8 days ago)
  |\

culprit * eb761340 - (HEAD) Merge cross-shard into master (7 days ago)

• eb761340 - (HEAD) Merge cross-shard into master (7 days ago)
  |\
  | * b4c9a326 - (tag: pangaea-20190822.0) [Pangaea] Update wallet.ini bootnodes (#1406) (8 days ago)
  | * 460c76bd - [Pangaea] New bootnode servers (#1405) (8 days ago)
  | * cbce10b9 - Merge pull request #1385 from john-harmony/local_with_explorer (8 days ago)
  | |\
  | | * 6f15fbd8 - add explorer configuartion for local (9 days ago)
  | * | d21bc08e - Merge pull request #1388 from harmony-ek/fix_kill_node (8 days ago)
  | |\ \
  | | * | edef0987 - Use kill_node.sh for killing nodes (9 days ago)
  | | * | fd8a3935 - Only kill processes with matching binary names (9 days ago)
  | * | | 918b70bb - Merge pull request #1394 from mikedoan/one_address (8 days ago)
  | |\ \ \
  | | * | | 806a3b05 - add comment for any caller using this api (8 days ago)
  | | * | | b5c78354 - add test (8 days ago)
  | | * | | 5d796a9a - support one address from rpc call (8 days ago)
  | * | | | 4683826b - Merge pull request #1390 from flicker-harmony/pr_explorer_fixes (8 days ago)
  | |\ \ \ \
  | | ||/ /
  | |/| | |
  | | * | | 7e3b9424 - Merge branch 'master' of https://github.com/harmony-one/harmony into localnet_update_explorer (9 days ago)
  | | |\ \ \
  | | |/ / /
  | |/| | |
  | * | | | cce1cfcb - (tag: pangaea-20190820.0) [Pangaea] Fix typo in account configs (#1386) (9 days ago)
  | | ||/
  | |/| |
  | | * | 32497ea7 - Fixes after testing explorer (9 days ago)
  | |/ /
  | * | aa86b9f7 - Revert "[pangaea] temporary pause the harmony nodes on shard0/1" (#1383) (9 days ago)
  | * | f5862343 - [Pangaea] 1000 total nodes w/ 80 internal (#1380) (9 days ago)
  | * | 6f02313d - Merge pull request #1382 from flicker-harmony/pr_explorer_small_fix (9 days ago)
  | |\ \
  | | * \ ba11a92c - Merge branch 'master' of https://github.com/harmony-one/harmony into pr_explorer_committee_api (9 days ago)
  | | |\ \
  | | |/ /
  | |/| |
  | * | | 661d008f - Merge pull request #1381 from alajko/pangaea-keys (10 days ago)
  | |\ \ \
  | | * | | 32dae845 - replacing 4 initial keys (10 days ago)
  | | * | | 7d12a49b - replaced foundational keys (10 days ago)
  | |/ / /
  | * | | 6e466e7a - Merge pull request #1377 from lzl124631x/ricl-address (10 days ago)
  | |\ \ \
  | | |_|/
  | |/| |