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/07/18 19:05:12 UTC
[2/5] incubator-mnemonic git commit: Merge branch 'durable-computing'
Merge branch 'durable-computing'
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/0cabec9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/0cabec9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/0cabec9c
Branch: refs/heads/master
Commit: 0cabec9c495a61a2b118e877110640e426e5479b
Parents: 69ebfa4 b9286b1
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Mon Jul 18 11:52:43 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Mon Jul 18 11:52:43 2016 -0700
----------------------------------------------------------------------
build-tools/source-assembly.xml | 59 ++++++++++++++++++++++++++----
mnemonic-computing-services/pom.xml | 28 +++++++++-----
mnemonic-memory-services/pom.xml | 63 ++++++++++++++++----------------
pom.xml | 3 +-
4 files changed, 103 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0cabec9c/mnemonic-computing-services/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0cabec9c/mnemonic-memory-services/pom.xml
----------------------------------------------------------------------
diff --cc mnemonic-memory-services/pom.xml
index 93d182b,d0fa1ba..ee7c544
--- a/mnemonic-memory-services/pom.xml
+++ b/mnemonic-memory-services/pom.xml
@@@ -24,13 -25,13 +25,13 @@@
<parent>
<groupId>org.apache.mnemonic</groupId>
<artifactId>mnemonic-parent</artifactId>
- <version>0.1.2-incubating-SNAPSHOT</version>
+ <version>0.2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>mnemonic-memory-services</artifactId>
<name>mnemonic-memory-services</name>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
<url>http://mnemonic.incubator.apache.org</url>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0cabec9c/pom.xml
----------------------------------------------------------------------