)]}'
{
  "commit": "14d2bbaa3f4aa53152472694c29f336808e47313",
  "tree": "e39bdddef4ea53207dd8fb61e1fd6b54d8c7721d",
  "parents": [
    "51d4ef832c1e58150325630e25c442866e5a6cf5",
    "e96b312150d8e376c1ef463793d1929eca3618d5"
  ],
  "author": {
    "name": "Avneesh Sachdev",
    "email": "avneesh@opensourcerouting.org",
    "time": "Wed Apr 11 23:51:08 2012 -0700"
  },
  "committer": {
    "name": "Avneesh Sachdev",
    "email": "avneesh@opensourcerouting.org",
    "time": "Wed Apr 11 23:51:08 2012 -0700"
  },
  "message": "Merge quagga mainline into the google ISIS code.\n\nThe steps were:\n\n  $ git checkout google-is-is\n  $ git merge quagga\n  $ git checkout google-is-is -- isisd\n\n  # Resolve conflicts in the following:\n  lib/md5.h\n  zebra/rt_netlink.c\n  zebra/zebra_rib.c\n  zebra/zserv.c\n\nNote that the content in the isisd directory is left unchanged in the\nmerge. As a result, changes made to isisd as part of the following\ncommits on the quagga mainline are dropped.\n\n  # 8ced4e82 is the merge base, e96b3121 is the current quagga master\n  $ git log --oneline --reverse 8ced4e82..e96b3121 -- isisd\n  5574999 isisd: fix crash on \"no router isis\" (BZ#536)\n  8998075 isisd: raise hello rate for DIS (BZ#539)\n  306ca83 isisd: include hash.h, not hash.c\n  b82cdeb delete CVS keywords\n  2f65867 isisd: indent longopts array\n  b511468 quagga: option \"-z\" (\"--socket \u003cpath\u003e\") added\n  05e54ee build: delete .cvsignore files\n  b4e45f6 fix zebra protocol after MP-BGP changes\n  7fd6cd8 isisd: fix circuit state machine\n  907fd95 isisd: send proper LSP after DIS election\n  d034aa0 isisd: fix wrong next-hops from SPF\n  c25eaff isisd: unexpected kernel routing table (BZ#544)\n  e6b03b7 isisd: implement MD5 circuit authentication\n",
  "tree_diff": []
}