Skip to content
This repository was archived by the owner on Oct 9, 2019. It is now read-only.

Conversation

@jgarzik
Copy link

@jgarzik jgarzik commented May 29, 2017

Travis times out jobs that continue beyond a time limit (~1 hour).
This change works around this condition, by disabling lesser-used
builds.

Travis times out jobs that continue beyond a time limit (~1 hour).
This change works around this condition, by disabling lesser-used
builds.
@jgarzik jgarzik merged commit 1ab2dda into segwit2x May 29, 2017
@jgarzik jgarzik deleted the 2017_disable_win_builds branch May 29, 2017 03:08
hovah pushed a commit to hovah/bitcoin that referenced this pull request Aug 11, 2017
c521b3ac6 Merge btc1#11: fixup define checks. Cleans up some oopses from btc1#5.
8b1cd3753 fixup define checks. Cleans up some oopses from btc1#5.
6b1508d6d Merge btc1#6: Fixes typo
fceb80542 Merge btc1#10: Clean up compile-time warnings (gcc 7.1)
0ec2a343f Clean up compile-time warnings (gcc 7.1)
d4c268a35 Merge btc1#5: Move helper functions out of sse4.2 object
8d4eb0847 Add HasAcceleratedCRC32C to port_win.h
77cfbfd25 crc32: move helper functions out of port_posix_sse.cc
4c1e9e016 silence compiler warnings about uninitialized variables
495316485 Merge btc1#2: Prefer std::atomic over MemoryBarrier
2953978ef Fixes typo
f134284a1 Merge btc1#1: Merge upstream LevelDB 1.20
ba8a445fd Prefer std::atomic over MemoryBarrier

git-subtree-dir: src/leveldb
git-subtree-split: c521b3ac654cfbe009c575eacf7e5a6e189bb5bb
hovah pushed a commit to hovah/bitcoin that referenced this pull request Aug 11, 2017
b13a68e Squashed 'src/leveldb/' changes from 196962ff0..c521b3ac6 (Pieter Wuille)

Pull request description:

  Includes:
  * bitcoin-core/leveldb-subtree#2: Prefer std::atomic over MemoryBarrier (Pieter Wuille)
  * bitcoin-core/leveldb-subtree#5: Move helper functions out of sse4.2 object (Cory Fields)
  * bitcoin-core/leveldb-subtree#6: Fixes typo (Dimitris Tsapakidis)
  * bitcoin-core/leveldb-subtree#10: Clean up compile-time warnings (gcc 7.1) (Matt Corallo)
  * bitcoin-core/leveldb-subtree#11: fixup define checks. Cleans up some oopses from btc1#5 (Cory Fields)

Tree-SHA512: 2b88a99a86ed8c74c860de13a123ea7f5424d35d314be564820cf83aaae8308383403f7cd56f17c241cfee4885699796141fed666559c21044eaabaeea073315
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants