Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: voldemort/voldemort
base: master
...
head fork: voldemort/voldemort
compare: li-r1028-bugfix
Checking mergeability… Don't worry, you can still create the pull request.
Commits on May 18, 2010
Neha Narkhede some view changes for supporting server side transforms. Changes inco…
…mplete
e288e87
Commits on May 19, 2010
Neha Narkhede server-side transforms using Voldemort views - code complete 219a280
Commits on May 24, 2010
Neha Narkhede all unit tests running after server-side transforms changes 45af568
Commits on May 25, 2010
Neha Narkhede added some unit tests for views with transforms 8e02443
Commits on Jun 03, 2010
Neha Narkhede views tests using stores.xml d9d1165
@rsumbaly rsumbaly Merge branch 'trunk' into neha-master
Need to modify - RedirectingStore
Conflicts:
	src/java/voldemort/store/rebalancing/RedirectingStore.java
04b8fb4
@rsumbaly rsumbaly Minor changes to Benchmark tool 29f895e
Commits on Jun 07, 2010
Neha Narkhede more unit tests for views using stores.xml + bug fixes 7e0501b
Neha Narkhede minor bug fixes found using the Voldemort shell cfc91c0
Commits on Jun 09, 2010
Neha Narkhede benchmark for views 92c5016
Commits on Jun 12, 2010
Neha Narkhede view-serializer-factory and supporting compressed stores for views 2e4df16
@nehanarkhede nehanarkhede merging voldemort master branch into server-transforms 01b82c4
@nehanarkhede nehanarkhede changes for some merge conflicts due to merging voldemort trunk into …
…server-transforms
a63db36
Commits on Jun 13, 2010
@nehanarkhede nehanarkhede bug fixes found during backwards compatibility tests 3ebfcc4
Commits on Jun 14, 2010
@afeinberg afeinberg Downgrade google collect to 1.0-rc2 for li-r1024 177ae3d
@afeinberg afeinberg Switch protobuf jar to 2.1.0 56ee70e
@afeinberg afeinberg Rerun protobuf codegen with protobuf 2.1.0 6cad3aa
@afeinberg afeinberg Set a li specific version 03e0e44
@nehanarkhede nehanarkhede Code refactor. StoreClient interface resumed to original. Added a Vie…
…wStoreClient and ViewUpdateAction interface for views
0557655
Commits on Jun 15, 2010
@nehanarkhede nehanarkhede Code refactor. StoreClient interface resumed to original. Added a Vie…
…wStoreClient and ViewUpdateAction interface for views
11fe625
@afeinberg afeinberg Bump up version again. 347194f
Commits on Jun 17, 2010
@afeinberg afeinberg Merge branch 'master' into server-transforms 3327ec2
Commits on Jun 18, 2010
@afeinberg afeinberg Merge branch 'master' into server-transforms 27d5f5b
@afeinberg afeinberg Merge branch 'server-transforms' into server-transforms-network
Conflicts:
	build.properties
5f03cb8
Commits on Jun 23, 2010
@nehanarkhede nehanarkhede bug fix in MockStoreClientFactory.java ebdf7fd
@afeinberg afeinberg Merge branch 'server-transforms' of http://github.com/nehanarkhede/vo…
…ldemort into server-transforms
32c5055
@afeinberg afeinberg Merge branch 'master' into server-transforms
Conflicts:
	src/java/voldemort/store/invalidmetadata/InvalidMetadataCheckingStore.java
1a4a197
@afeinberg afeinberg Fixed InvalidMetadataCheckingStoreTest to work with server transforms 4f6b70b
@afeinberg afeinberg Merge branch 'server-transforms' into server-transforms-network c7fc319
@nehanarkhede nehanarkhede another bug fix in MockStoreClientFactory e5642fc
@afeinberg afeinberg Merge branch 'server-transforms' of http://github.com/nehanarkhede/vo…
…ldemort into server-transforms
a86e1a2
@afeinberg afeinberg Merge branch 'server-transforms' into server-transforms-network bbded9c
@afeinberg afeinberg Bump up the version to .li4 61a91cc
Commits on Jun 24, 2010
@nehanarkhede nehanarkhede Moved instantiation of the view serializer factory from the StoreDefi…
…nitionsMapper to the ViewStorageConfiguration
fb84aaa
@afeinberg afeinberg Merge branch 'server-transforms' of http://github.com/nehanarkhede/vo…
…ldemort into server-transforms
fea5393
@afeinberg afeinberg Merge branch 'server-transforms' into server-transforms-network 4dd8512
@nehanarkhede nehanarkhede pushed instantiation of the view class from StoreDefinitionsMapper to…
… the ViewStorageConfiguration
d4c50f3
@afeinberg afeinberg Merge branch 'server-transforms' of http://github.com/nehanarkhede/vo…
…ldemort into server-transforms
313e0da
@afeinberg afeinberg Merge branch 'server-transforms' into server-transforms-network 51b7dc2
Commits on Jul 14, 2010
@afeinberg afeinberg Stopped using local servletContext 47a497b