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.

Sign up for GitHub

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

Jump to bottom

[Trigger CI]: Subsystems (WIP) #1339

Closed
wants to merge 20 commits into from
Closed

[Trigger CI]: Subsystems (WIP) #1339

wants to merge 20 commits into from

Conversation

benjyw
Copy link
Contributor

@benjyw benjyw commented Mar 27, 2015

No description provided.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.21% when pulling 66a2fec on benjyw:subsystems into 20bf252 on pantsbuild:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.21% when pulling 66a2fec on benjyw:subsystems into 20bf252 on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.21% when pulling 66a2fec on benjyw:subsystems into 20bf252 on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.22% when pulling b4da338 on benjyw:subsystems into 5563ade on pantsbuild:master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.22% when pulling b4da338 on benjyw:subsystems into 5563ade on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.22% when pulling b4da338 on benjyw:subsystems into 5563ade on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 69.22% when pulling b4da338 on benjyw:subsystems into 5563ade on pantsbuild:master.

Benjy added 2 commits April 7, 2015 16:12
Merge branch 'master' into subsystems
ad60633
Merge branch 'master' into subsystems
97ef498 
Conflicts:
	tests/python/pants_test/base/BUILD
	tests/python/pants_test/base/context_utils.py
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling 97ef498 on benjyw:subsystems into abbe4f8 on pantsbuild:master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling 97ef498 on benjyw:subsystems into abbe4f8 on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling 97ef498 on benjyw:subsystems into abbe4f8 on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling 97ef498 on benjyw:subsystems into abbe4f8 on pantsbuild:master.

Merge branch 'master' into subsystems
cf24df4 
Conflicts:
	tests/python/pants_test/base_test.py
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling cf24df4 on benjyw:subsystems into 4c876ca on pantsbuild:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling cf24df4 on benjyw:subsystems into 4c876ca on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 68.92% when pulling cf24df4 on benjyw:subsystems into 4c876ca on pantsbuild:master.

Merge branch 'master' into subsystems
07a8878 
Conflicts:
	tests/python/pants_test/base_test.py
Benjy added 7 commits April 13, 2015 08:51
Merge branch 'master' into subsystems
bb13c9c 
Conflicts:
	src/python/pants/backend/core/tasks/task.py
	src/python/pants/backend/jvm/tasks/jar_task.py
	src/python/pants/backend/jvm/tasks/jvm_tool_task_mixin.py
	src/python/pants/bin/goal_runner.py
	src/python/pants/option/options.py
	src/python/pants/subsystem/BUILD
	src/python/pants/subsystem/subsystem.py
	tests/python/pants_test/jvm/jvm_tool_task_test_base.py
Fix merge bug.
6e4aa9d
Fix another merge error.
5c198f9
Merge branch 'master' into subsystems
d5a8ae4
Fix another spurious error.
8c34afc
More merge fixes
354822c
Reuse registration code for the bootstrap task in tests.
3862ef5
@coveralls
Copy link

Coverage Status

Coverage remained the same at 69.13% when pulling 3862ef5 on benjyw:subsystems into 734bd04 on pantsbuild:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage remained the same at 69.13% when pulling 3862ef5 on benjyw:subsystems into 734bd04 on pantsbuild:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 69.13% when pulling 3862ef5 on benjyw:subsystems into 734bd04 on pantsbuild:master.

@benjyw benjyw closed this Apr 15, 2015
@benjyw benjyw deleted the subsystems branch April 15, 2015 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@benjyw @coveralls