You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/12/15 10:06:10 UTC
[1/4] marmotta git commit: MARMOTTA-621: fixed more compilation
issues with the support of @wastl
Repository: marmotta
Updated Branches:
refs/heads/develop c30dbf0fd -> d6ad3432e
MARMOTTA-621: fixed more compilation issues with the support of @wastl
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/40964cb5
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/40964cb5
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/40964cb5
Branch: refs/heads/develop
Commit: 40964cb5cd92c73d7f431018689d9b762253077e
Parents: 900a70c
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Dec 14 16:30:29 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Dec 15 08:25:05 2015 +0100
----------------------------------------------------------------------
libraries/ostrich/backend/Dockerfile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/40964cb5/libraries/ostrich/backend/Dockerfile
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/Dockerfile b/libraries/ostrich/backend/Dockerfile
index 12195be..d423913 100644
--- a/libraries/ostrich/backend/Dockerfile
+++ b/libraries/ostrich/backend/Dockerfile
@@ -40,12 +40,16 @@ RUN apt-get update -qq \
libgflags-dev \
libgtest-dev \
libboost-all-dev \
- libtcmalloc-minimal4
+ libtcmalloc-minimal4 \
+ libgoogle-perftools-dev
-RUN git clone https://github.com/wikier/grpc.git \
+RUN git clone https://github.com/grpc/grpc.git \
&& cd grpc \
&& git submodule update --init --recursive \
&& make \
+ && cd third_party/protobuf \
+ && make install \
+ && cd ../.. \
&& make install \
&& cd ..
[4/4] marmotta git commit: MARMOTTA-621: cleanup
Posted by wi...@apache.org.
MARMOTTA-621: cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d6ad3432
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d6ad3432
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d6ad3432
Branch: refs/heads/develop
Commit: d6ad3432e6e885e456418f35b62b47b8cc94065d
Parents: a1499bd
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Dec 15 09:47:06 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Dec 15 10:04:49 2015 +0100
----------------------------------------------------------------------
libraries/ostrich/backend/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d6ad3432/libraries/ostrich/backend/Dockerfile
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/Dockerfile b/libraries/ostrich/backend/Dockerfile
index d423913..e102dae 100644
--- a/libraries/ostrich/backend/Dockerfile
+++ b/libraries/ostrich/backend/Dockerfile
@@ -1,6 +1,6 @@
# Dockerfile for Apache Marmotta Ostrich Triplestore
-FROM debian:jessie
+FROM debian:stretch
MAINTAINER Sergio Fernández <wi...@apache.org>
ADD . /src
@@ -22,11 +22,10 @@ ENV LANG en_US.utf8
RUN apt-get update -qq \
&& apt-get install -y \
- build-essential \
+ build-essential \
autoconf \
libtool \
cmake \
- clang \
libc++-dev \
python-all-dev \
python-virtualenv \
@@ -64,7 +63,8 @@ RUN mkdir build \
RUN apt-get -y clean -qq \
&& apt-get -y autoclean -qq \
&& apt-get -y autoremove -qq \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && rm -rf /src/grpc
RUN mkdir -p ${DB_PATH}
[3/4] marmotta git commit: MARMOTTA-621: applied patch by @wastl
Posted by wi...@apache.org.
MARMOTTA-621: applied patch by @wastl
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a1499bd7
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a1499bd7
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a1499bd7
Branch: refs/heads/develop
Commit: a1499bd781b986296c9af02f6f172ebb08a9f15a
Parents: 4fb6e7f
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Dec 15 09:46:47 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Dec 15 09:46:47 2015 +0100
----------------------------------------------------------------------
libraries/ostrich/backend/serializer/serializer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a1499bd7/libraries/ostrich/backend/serializer/serializer.h
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/serializer/serializer.h b/libraries/ostrich/backend/serializer/serializer.h
index 965fb9c..99d6ed4 100644
--- a/libraries/ostrich/backend/serializer/serializer.h
+++ b/libraries/ostrich/backend/serializer/serializer.h
@@ -39,7 +39,7 @@ class Serializer {
impl->serialize(stmt, out);
};
- void serialize(StatementIterator it, std::ostream& out) {
+ void serialize(StatementIterator& it, std::ostream& out) {
impl->serialize(it, out);
};
[2/4] marmotta git commit: merged
Posted by wi...@apache.org.
merged
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4fb6e7fa
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4fb6e7fa
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4fb6e7fa
Branch: refs/heads/develop
Commit: 4fb6e7fad011f9d8d5d0d4d825616aa20906863b
Parents: 40964cb c30dbf0
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Dec 15 09:36:36 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Dec 15 09:36:36 2015 +0100
----------------------------------------------------------------------
libraries/ostrich/backend/CMakeLists.txt | 9 ++++++---
libraries/ostrich/backend/client/CMakeLists.txt | 1 +
libraries/ostrich/backend/persistence/CMakeLists.txt | 1 +
.../ostrich/backend/persistence/leveldb_persistence.cc | 6 ++++--
libraries/ostrich/backend/sharding/CMakeLists.txt | 1 +
5 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------