Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop sophia content store back end #727

Merged
merged 6 commits into from
Jul 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ AC_CONFIG_FILES( \
src/common/liblsd/Makefile \
src/common/libutil/Makefile \
src/common/libev/Makefile \
src/common/libsophia/Makefile \
src/common/libminilzo/Makefile \
src/common/libpmi-client/Makefile \
src/common/libpmi-server/Makefile \
Expand All @@ -199,7 +198,6 @@ AC_CONFIG_FILES( \
src/modules/Makefile \
src/modules/connector-local/Makefile \
src/modules/kvs/Makefile \
src/modules/content-sophia/Makefile \
src/modules/content-sqlite/Makefile \
src/modules/libkz/Makefile \
src/modules/libjsc/Makefile \
Expand Down
5 changes: 2 additions & 3 deletions doc/man1/flux-content.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ BACKING STORE
-------------
The rank 0 cache retains all content until a module providing
the "content-backing" service is loaded which can offload content
to some other place. Examples of modules providing this service
are *content-sqlite* and *content-sophia*. The *content-sqlite*
module is loaded by default.
to some other place. The *content-sqlite* module provides this
service, and is loaded by default.

Content database files are stored persistently on rank 0 if the
persist-directory broker attribute is set to a directory name for
Expand Down
3 changes: 1 addition & 2 deletions src/common/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = libtap libev libsophia libminilzo libpmi-client libpmi-server \
SUBDIRS = libtap libev libminilzo libpmi-client libpmi-server \
liblsd libutil libflux libsubprocess libcompat liboptparse

AM_CFLAGS = @GCCWARN@ $(CODE_COVERAGE_CFLAGS)
Expand All @@ -13,7 +13,6 @@ libflux_internal_la_LIBADD = \
$(builddir)/liblsd/liblsd.la \
$(builddir)/libutil/libutil.la \
$(builddir)/libev/libev.la \
$(builddir)/libsophia/libsophia.la \
$(builddir)/libminilzo/libminilzo.la \
$(builddir)/libpmi-client/libpmi-client.la \
$(builddir)/libpmi-server/libpmi-server.la \
Expand Down
9 changes: 0 additions & 9 deletions src/common/libsophia/Makefile.am

This file was deleted.

Loading