Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposed 0.40.0-b8 #1874

Merged
merged 11 commits into from Oct 18, 2016

Conversation

Projects
None yet
6 participants
@ximinez
Copy link
Contributor

ximinez commented Oct 17, 2016

Merge PRs #1838, #1840, #1846, #1868, and #1865 into develop.
#1846 and #1868 had simple conflicts in the CMakeLists.txt file, which I was able to resolve. They could use a second look, though.

ximinez and others added some commits Aug 5, 2016

Improve CI / cmake for ripple-libpp support (RIPD-1255):
* Simplify Travis APT config.
* Automatically retry Travis build and test script. Will result in fewer
  false negatives.
* Travis install scripts use absolute paths.
* Build a library of cmake functions for reuse.
* Disallow cmake builds in project root.
* Disallow cmake default 32-bit Visual Studio builds.
* Add several missing nonunity / header files, including all unit tests to
  cmake.
* Change gcc.debug.nounity Travis build to use cmake, instead of adding
  builds.
* Change Appveyor build to cmake. Eliminates most spurious failures, which
  are caused by python or scons failing to download.
Consensus refactor preliminary changes (RIPD-1011):
* Remove extraneous passing of transaction set hashes
* Remove recentPositions_. InboundTXs does the job now
* Move responsibility for sending "have TX set" out of consensus
Begin consensus refactor (RIPD-1011):
* New RCLCx* classes
* Refactor consensus positions
* Refactor proposed transaction sets
* Refactor disputed transactions
* Refactor position broadcast/replay
Add CMake target for docs:
* Includes docs/ files in VC and xcode projects.
* Does NOT build automatically, so will not affect systems without the
  build toolchain.
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Oct 17, 2016

Current coverage is 64.44% (diff: 28.24%)

Merging #1874 into develop will increase coverage by 0.01%

@@            develop      #1874   diff @@
==========================================
  Files           683        685     +2   
  Lines         48973      49009    +36   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          31554      31583    +29   
- Misses        17419      17426     +7   
  Partials          0          0          

Powered by Codecov. Last update aa11eff...7688a97

@ximinez ximinez merged commit 7688a97 into ripple:develop Oct 18, 2016

4 of 5 checks passed

codecov/patch 28.24% of diff hit (target 64.43%)
Details
ci/circleci Your tests passed on CircleCI!
Details
codecov/project 64.44% (+0.01%) compared to aa11eff
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ximinez ximinez deleted the ximinez:develop-next branch Oct 18, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.