Merge master into trunk-level #101
Merged
Conversation
This file contains hidden or 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
Signed-off-by: John Else <[email protected]>
CA-180015: Add a Copying state for mirrors
So far all xenopsd operations do not have return value. However, in some cases, we do need to return data/information back to the caller, hence the unit type no longer fits. In theory, different operations might want to return different types of data and the possibility is unlimited. Here we use Rpc.t as a generic representation of all the possible return types (also be consistent with the type argument of the "Failed" variant here). It's up to the caller to eventually decode the value properly. As the cases of requiring a return value are still rare, it won't be a hassle. Signed-off-by: Zheng Li <[email protected]>
Signed-off-by: Zheng Li <[email protected]>
Signed-off-by: David Scott <[email protected]>
Signed-off-by: David Scott <[email protected]>
Prepare to release 0.14.0
This reverts commit 5a9bfe7.
This reverts commit b051ba1.
This reverts commit 78aea49. Conflicts: rrd/rrd_interface.ml
This reverts commit a89f877.
This reverts commit 3fe623e.
CAR-1744: add support for running in-guest user scripts
CA-177513: Revert changes to remove master/slave/knowledge from rrdd
1) push_sr_rrd : Load sr-rrds from filesystem 2) archive_sr_rrd : Archive sr-rrds to filesystem 3) sr_rrds_path : Identify sr-rrds filesystem location Signed-off-by: Sharad Yadav <[email protected]>
CP-13995: Adding new xcp-rrdd interfaces for sr-level rrds archiving.
The interface before this patch involved asking an RRD server where for the path that it would store the archive should it succeed, then an archive call, and then checking that the file was there since in the error case there are no exceptions to return. Similarly for restoring from an archive a client would have to ask the server where it expects these archives to be to restore, put the file there and then call restore. This patch simplifies the interface such that: * The restore function takes a path to restore from in addition to the uuid; * The archive function returns a path to the archive; * An exception is defined so that we don't have to silently fail. Signed-off-by: Si Beaumont <[email protected]>
CA-185923: Use a sane API for archiving/pushing SR RRDs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.