forked from voldemort/voldemort
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/voldemort/voldemort
# By Vinoth Chandar (16) and others # Via Siddharth Singh * 'master' of https://github.com/voldemort/voldemort: (56 commits) Upgrade Google Collections lib to Guava lib Dropped META-INF/MANIFEST.MF Fixes to KeySampler/KeyVersionFetcher Add MANIFEST.MF to git ignore Small bug fixes and cleanup in R2Store Make sure elapsed time is not negative Adding a null check for the versioned value object in convertStringToObject in MetadataStore. This was causing a small problem while restarting the Voldemort server Fix unused variable cleanup on tests more cleanup on the test Cleaned up the test Made the getserverStateLocked explicit adding the new test case this time around Added new end to end test for verifying the atomic update is consistent on bootstrap cleaned up code based off last code review atomic update of stores and cluster xml during rebalance Allow update metadata to take both stores and cluster xml more commits on slop fix deprecate send hint serial additional slop fix additional logging added end-to-end test for slops ...
- Loading branch information
Showing
152 changed files
with
10,359 additions
and
3,131 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,3 +14,4 @@ server.state | |
.temp | ||
.idea | ||
data/ | ||
META-INF/MANIFEST.MF |
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,5 +42,5 @@ tomcat.context=/voldemort | |
javac.version=1.5 | ||
|
||
## Release | ||
curr.release=1.3.1 | ||
curr.release=1.3.3 | ||
|
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
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
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
Binary file not shown.
Binary file not shown.
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
Oops, something went wrong.