Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Post-2.0 merge cleanup after review of changes.
- Loading branch information
Doug Rohrer
committed
Dec 19, 2014
1 parent
2396709
commit 06a20ad
Showing
2 changed files
with
6 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
06a20ad
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from andrewjstone
at 06a20ad
06a20ad
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging basho/riak_core/integration/riak-admin-handoff-team = 06a20ad into borshop-integration-678-integration/riak-admin-handoff-team
06a20ad
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
basho/riak_core/integration/riak-admin-handoff-team = 06a20ad merged ok, testing candidate = 7a93a51
06a20ad
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.bos1/builders/test-riak_core/builds/1456
06a20ad
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding 2.0 to borshop-integration-678-integration/riak-admin-handoff-team = 7a93a51