Public Git Hosting - elliptics.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 7c48027 8f0f4fe)

commit	e4c648be44b6c0c7facabeef460af78e3e986c72
author	Evgeniy Polyakov <zbr@ioremap.net>
	Tue, 9 Oct 2012 18:08:56 +0000 (9 22:08 +0400)
committer	Evgeniy Polyakov <zbr@ioremap.net>
	Tue, 9 Oct 2012 18:08:56 +0000 (9 22:08 +0400)
tree	370369d6921f4593272d5f165a7934dfa9c9d178	tree \| snapshot (tar.gz zip)
parent	7c4802719c21835187f0e29fa519202f1333aaef	commit \| diff
parent	8f0f4fe6b5a3932032063860a2fe504758637fc7	commit \| diff

Merge branch 'master' of toshik-nb-w7.ld.yandex.ru/gitweb/elliptics into toshik

Conflicts:
bindings/python/elliptics.py
bindings/python/elliptics_python.cpp
srw/srw.cpp

bindings/python/elliptics.py	diff1 \|	diff2 \|	blob \| history
bindings/python/elliptics_python.cpp	diff1 \|	diff2 \|	blob \| history
example/check.c	diff1 \|	diff2 \|	blob \| history
srw/srw.cpp	diff1 \|	diff2 \|	blob \| history

Elliptics network is a fault tolerant key/value storage.