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

Merging HPX0.9.10 into pxfs branch #1542

Merged
merged 318 commits into from May 22, 2015

Conversation

Projects
None yet
9 participants
@hapoo
Copy link
Member

commented May 22, 2015

Merging HPX0.9.10 into pxfs branch

dcbdan and others added some commits Feb 4, 2015

Merge pull request #1371 from STEllAR-GROUP/more_held_locks
Avoid holding a lock during agas::incref while doing a credit split
Merge pull request #1374 from STEllAR-GROUP/msvc_fix
This PR fixes the MSVC 12 release builder
Merge pull request #1373 from dcbdan/master
 Modifying parallel search algorithm for zero length searches
- Avoid code duplication in decode_/encode_parcels
 - Avoid starvation of MPI sends/receives
Adding overload for hpx::components::migrate() for client_base<> inst…
…ances (similar to hpx::components::copy()

(cherry picked from commit 2d77861)
Merge branch 'master' into fixing_1163
Conflicts:
	hpx/lcos/broadcast.hpp
	hpx/lcos/reduce.hpp
Making forward constructors variadic
(cherry picked from commit 5a7e1fe)
@hkaiser

This comment has been minimized.

Copy link
Member

commented on hpx/parallel/algorithms/exclusive_scan.hpp in 2ca4815 Mar 16, 2015

Absolutely minor: could you please stick to the formatting (indentation) of the surrounding code?

@hapoo hapoo changed the title Pxfs Merging HPX0.9.10 into pxfs branch May 22, 2015

@hkaiser hkaiser added this to the 0.9.11 milestone May 22, 2015

hkaiser added a commit that referenced this pull request May 22, 2015

Merge pull request #1542 from hapoo/pxfs
Merging HPX0.9.10 into pxfs branch

@hkaiser hkaiser merged commit 601117c into STEllAR-GROUP:pxfs May 22, 2015

1 check failed

ci/circleci Your tests failed
Details
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.