From 905b5a33ebb10d0956dba964ef5fb6f776888672 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Sat, 13 Oct 2018 10:50:20 +0200 Subject: [PATCH 1/4] added link for Marc2018 --- src/DAMASK_marc2018.f90 | 1 + 1 file changed, 1 insertion(+) create mode 120000 src/DAMASK_marc2018.f90 diff --git a/src/DAMASK_marc2018.f90 b/src/DAMASK_marc2018.f90 new file mode 120000 index 000000000..2c5bec706 --- /dev/null +++ b/src/DAMASK_marc2018.f90 @@ -0,0 +1 @@ +DAMASK_marc.f90 \ No newline at end of file From 0ab6c298e480a8e7ee40360c46f848b69cb45170 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 13 Oct 2018 23:18:26 +0200 Subject: [PATCH 2/4] [skip ci] updated version information after successful test of v2.0.2-813-g2beeb9da --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e4ebd3adb..9f80e11e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-756-g7217cdac +v2.0.2-813-g2beeb9da From ea0286847291479547d802ade936221c39705929 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 14 Oct 2018 07:11:01 +0200 Subject: [PATCH 3/4] [skip ci] updated version information after successful test of v2.0.2-814-g1a458108 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e4ebd3adb..66dbd5d8f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-756-g7217cdac +v2.0.2-814-g1a458108 From 3ed22ecaa8a20e2434518de6cbbd50e34cfc88ca Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 14 Oct 2018 12:33:12 +0200 Subject: [PATCH 4/4] prevent failing tests due to scatter in nonlocal results --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 70f135395..032ae29de 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 70f135395370b06c424e0dcf163afbd9d8ad24a1 +Subproject commit 032ae29de57cc7cc52d429e574b9392e48cc9fcd