[taler-merchant] branch master updated (5f3116d3 -> 70afc87a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository merchant.

    from 5f3116d3 -misc doxygen fixes
     new aadd06b4 -polishing
     new 70afc87a -remove outdated submodule

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                                   | 4 ----
 contrib/merchant-backoffice                   | 1 -
 src/testing/test_merchant_product_creation.sh | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 160000 contrib/merchant-backoffice

diff --git a/.gitmodules b/.gitmodules
index c898b036..91e0186e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,3 @@
        path = doc/prebuilt
        url = git://git.taler.net/docs.git
        branch = prebuilt
-[submodule "contrib/merchant-backoffice"]
-       path = contrib/merchant-backoffice
-       url = git://git.taler.net/merchant-backoffice
-    branch = prebuilt
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
deleted file mode 160000
index 8a683531..00000000
--- a/contrib/merchant-backoffice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a6835316532d9e250bbdfe9ff55432a1acca62c
diff --git a/src/testing/test_merchant_product_creation.sh 
b/src/testing/test_merchant_product_creation.sh
index fa769e47..702b0e53 100755
--- a/src/testing/test_merchant_product_creation.sh
+++ b/src/testing/test_merchant_product_creation.sh
@@ -29,7 +29,7 @@ STATUS=$(curl -H "Content-Type: application/json" -X POST \
 
 if [ "$STATUS" != "204" ]
 then
-    echo 'should respond ok, instance created. got:' $STATUS
+    echo "Should have responded 204 No content, instance created. Got $STATUS 
instead"
     exit 1
 fi
 echo OK
@@ -164,7 +164,7 @@ STATUS=$(curl 
'http://localhost:9966/instances/default/private/orders' \
 
 if [ "$STATUS" != "200" ]
 then
-    echo 'should respond ok, lock should apply. got:' $STATUS `cat 
$LAST_RESPONSE`
+    echo 'Should respond 200 OK, lock should apply. Got:' $STATUS `cat 
$LAST_RESPONSE`
     exit 1
 fi
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.