Skip to content

Merge Master into Green#225

Merged
braddaw merged 4 commits into
feature/greenfrom
master
May 6, 2014
Merged

Merge Master into Green#225
braddaw merged 4 commits into
feature/greenfrom
master

Conversation

@braddaw

@braddaw braddaw commented May 6, 2014

Copy link
Copy Markdown
Contributor

No description provided.

David Beer and others added 4 commits April 23, 2014 11:58
Destructors are called on global objects once the main thread exits, causing invalid reads
and potentially crashes for threads that are still finishing work at that point. Now the
destructor does nothing to prevent problems.
Conflicts:

	src/server/test/exiting_jobs/scaffolding.c
	src/server/test/job_container/scaffolding.c
	src/server/test/job_func/scaffolding.c
	src/server/test/job_recov/scaffolding.c
	src/server/test/req_jobobit/scaffolding.c
	src/server/test/req_quejob/scaffolding.c
	src/server/test/track_alps_reservations/scaffolding.c
braddaw added a commit that referenced this pull request May 6, 2014
@braddaw braddaw merged commit 1295d6c into feature/green May 6, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant