You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2016/10/05 17:07:26 UTC

[2/2] incubator-mnemonic git commit: MNEMONIC-132: Terminate called without an active exception

MNEMONIC-132: Terminate called without an active exception


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/404502be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/404502be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/404502be

Branch: refs/heads/master
Commit: 404502bee1600cb712d759833848dfe065f302f5
Parents: 3c22e17
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Wed Oct 5 09:46:53 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Wed Oct 5 09:46:53 2016 -0700

----------------------------------------------------------------------
 README.md         | 2 +-
 docker/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/404502be/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 22d6d4d..be3fea1 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ Please see the file LICENSE for information on how this library is licensed.
 To build this library, you may need to install some required packages on the build system:
 
 * **Maven** -- the building tool v3.2.1 or above [Required]
-* **NVML** -- the NVM library (Please compile this library that is tagged with 1.1 release with pandoc dependency) (http://pmem.io) [Optional if mnemonic-nvml-vmem-service/mnemonic-nvml-pmem-service are excluded, e.g. on MacOSX]
+* **NVML** -- the NVM library (Please compile this library that was revised with 630862e82f) (http://pmem.io) [Optional if mnemonic-nvml-vmem-service/mnemonic-nvml-pmem-service are excluded, e.g. on MacOSX]
 * **JDK** -- the Java Develop Kit 1.6 or above (please properly configure JAVA_HOME) [Required]
 * **PMFS** -- the PMFS should be properly installed and configured on Linux system if you want to simulate read latency [Optional]
 * **PMalloc** -- a supported durable memory native library(Latest) at https://github.com/NonVolatileComputing/pmalloc.git [Optional if mnemonic-pmalloc-service is excluded]

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/404502be/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 657f51e..b57dd1b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -57,7 +57,7 @@ RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
     cd pmalloc && mkdir build && cd build && cmake .. && make && make install
 
 RUN cd /ws && git clone https://github.com/pmem/nvml.git && \
-    cd nvml && git checkout tags/1.1 && make && make install
+    cd nvml && git checkout 630862e82f && make && make install
 
 RUN echo export MAVEN_OPTS="\" $([[ \"x\" != \"x${proxy_host}\" ]] && echo -DproxySet=\\\"true\\\" -DproxyHost=${proxy_host} -DproxyPort=${proxy_port}) \"" \
     > /etc/profile.d/mvn.sh && chmod +x /etc/profile.d/mvn.sh