You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/03/17 09:52:38 UTC

[1/3] git commit: wrong version number - update to 3.1.0-incubating-SNAPSHOT

Repository: marmotta
Updated Branches:
  refs/heads/MARMOTTA-450 61ba807ad -> b07ed1383


wrong version number - update to 3.1.0-incubating-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/cdb3223d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cdb3223d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cdb3223d

Branch: refs/heads/MARMOTTA-450
Commit: cdb3223db7439a9f8fd7fb5159ffd52f6da0ecb7
Parents: 8e87a83
Author: Dietmar Glachs <dg...@gmail.com>
Authored: Mon Sep 23 12:16:34 2013 +0200
Committer: Dietmar Glachs <dg...@gmail.com>
Committed: Mon Sep 23 12:16:34 2013 +0200

----------------------------------------------------------------------
 client/marmotta-client-js-sample-webapp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/cdb3223d/client/marmotta-client-js-sample-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/pom.xml b/client/marmotta-client-js-sample-webapp/pom.xml
index 69bb541..afe52bf 100644
--- a/client/marmotta-client-js-sample-webapp/pom.xml
+++ b/client/marmotta-client-js-sample-webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 


[2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta

Posted by ss...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a9bf7e4f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a9bf7e4f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a9bf7e4f

Branch: refs/heads/MARMOTTA-450
Commit: a9bf7e4fa56f00e26e09a5fae002686eb65631df
Parents: be31f8a cdb3223
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:41:26 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:41:26 2013 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/3] git commit: Merge branch 'master' into MARMOTTA-450

Posted by ss...@apache.org.
Merge branch 'master' into MARMOTTA-450


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b07ed138
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b07ed138
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b07ed138

Branch: refs/heads/MARMOTTA-450
Commit: b07ed13830c003ae05dbe2abf9ef85cc8e0c6101
Parents: 61ba807 a9bf7e4
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Mar 17 09:50:35 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Mar 17 09:50:35 2014 +0100

----------------------------------------------------------------------

----------------------------------------------------------------------