Public Git Hosting - voldemort/jeffpc.git/commit

commit	491863359fac1b2c67fe6c1a719ef4c1f569c22d
author	Vinoth Chandar <mail.vinoth.chandar@gmail.com>
	Fri, 6 Jan 2012 02:48:47 +0000 (5 18:48 -0800)
committer	Vinoth Chandar <mail.vinoth.chandar@gmail.com>
	Fri, 6 Jan 2012 02:48:47 +0000 (5 18:48 -0800)
tree	1ec640d4a7a4be9cdd264fbfa4bc6e3bf26416fd	tree \| snapshot (tar.gz zip)
parent	aee112d9ef0ed960c7bc9955d7e85e6ed6ac91a0	commit \| diff
parent	fd5dbeb5113ffed51cf1836ac78b129a4bea4cb6	commit \| diff

Merge branch 'bdb_backup' of https://github.com/jroper/voldemort into jroper-bdb_backup

Conflicts:
clients/python/voldemort/protocol/voldemort_admin_pb2.py
src/java/voldemort/client/protocol/admin/AdminClient.java
src/java/voldemort/client/protocol/pb/VAdminProto.java
src/proto/voldemort-admin.proto

Josef 'Jeff' Sipek's voldemort changes

RSS Atom

clients/python/voldemort/protocol/voldemort_admin_pb2.py	diff1 \|	diff2 \|	blob \| history
src/java/voldemort/VoldemortAdminTool.java	diff1 \|	diff2 \|	blob \| history
src/java/voldemort/client/protocol/admin/AdminClient.java	diff1 \|	diff2 \|	blob \| history
src/java/voldemort/client/protocol/pb/VAdminProto.java	diff1 \|	diff2 \|	blob \| history
src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java	diff1 \|	diff2 \|	blob \| history
src/java/voldemort/store/bdb/BdbNativeBackup.java	\|	diff2 \|	blob \| history
src/proto/voldemort-admin.proto	diff1 \|	diff2 \|	blob \| history