Merge branch 'jh/memihash-opt' into next
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Apr 2017 08:31:51 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Apr 2017 08:31:51 +0000 (01:31 -0700)
commit6bfc58e19aa0b7e8ce3355b17017b0bee69ed695
treed0210e25e8a1c4771cc543420bdae1acaf1f3422
parent0e3151a226817c3c07c4878b88a23b0a10c959ef
parent845eec2b64d6a064ee7b453a77a309a419806896
Merge branch 'jh/memihash-opt' into next

Hotfix for a topic that is already in 'master'.

* jh/memihash-opt:
  t3008: skip lazy-init test on a single-core box
  test-online-cpus: helper to return cpu count
Makefile