From 941000d45ddedd3c0055e6393f95561ed3a3f229 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 12:34:57 +0000
Subject: [PATCH 01/18] chaned readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eee83f66..8403ff94 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+test12
 # OISP Frontend and Dashboard
 
 This repository consists of 2 distinct components. A browser-based dashboard written using AngularJS and also a Node application that provides all the public APIs.

From 2a454fea0b9787bc54ede705c806a57642021e40 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 12:44:56 +0000
Subject: [PATCH 02/18] Changed circleci

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 944ac3bd..5ee76738 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,6 +22,8 @@ jobs:
       - run: |
           echo hello world
           git branch 
+          echo $CIRCLE_PULL_REQUESTS
+
 
       - run: cd public-interface; npm install
 

From d81792d7b2af5ec7ee863b28aaed1ab01333c2ea Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 12:54:33 +0000
Subject: [PATCH 03/18] Changed circleci

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ee76738..b6ef5eff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,6 +23,8 @@ jobs:
           echo hello world
           git branch 
           echo $CIRCLE_PULL_REQUESTS
+          CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`
+          echo $CIRCLE_PR_BRANCH
 
 
       - run: cd public-interface; npm install

From abedb91a3836b70b7f54d5067e6c23b8dbe028f9 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 13:41:47 +0000
Subject: [PATCH 04/18] Changed circleci

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6ef5eff..79085c5f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,6 +23,9 @@ jobs:
           echo hello world
           git branch 
           echo $CIRCLE_PULL_REQUESTS
+          echo ${CIRCLE_PROJECT_USERNAME}
+          echo ${CIRCLE_PROJECT_REPONAME}
+          echo https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER}
           CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`
           echo $CIRCLE_PR_BRANCH
 

From b6cfccad36cfbb90337dbcf3bba3a7a00e8f7fb4 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 13:46:44 +0000
Subject: [PATCH 05/18] Changed circleci 3

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 79085c5f..656f2664 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,6 +25,8 @@ jobs:
           echo $CIRCLE_PULL_REQUESTS
           echo ${CIRCLE_PROJECT_USERNAME}
           echo ${CIRCLE_PROJECT_REPONAME}
+	  echo ${CIRCLE_PR_NUMBER}
+          echo dlrow olleh
           echo https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER}
           CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`
           echo $CIRCLE_PR_BRANCH

From 71a981b16570e0b1cb60b01123453b75aebad0c5 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 13:48:53 +0000
Subject: [PATCH 06/18] Changed circleci 4

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 656f2664..22a0fbba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
           echo $CIRCLE_PULL_REQUESTS
           echo ${CIRCLE_PROJECT_USERNAME}
           echo ${CIRCLE_PROJECT_REPONAME}
-	  echo ${CIRCLE_PR_NUMBER}
+          echo ${CIRCLE_PR_NUMBER}
           echo dlrow olleh
           echo https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER}
           CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`

From 801baa72ee59d0ff7cd0f0853ad9e33e8b2ba44b Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 13:55:30 +0000
Subject: [PATCH 07/18] Changed circleci 5

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22a0fbba..d7f9a111 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,6 +26,7 @@ jobs:
           echo ${CIRCLE_PROJECT_USERNAME}
           echo ${CIRCLE_PROJECT_REPONAME}
           echo ${CIRCLE_PR_NUMBER}
+          echo $CIRCLE_PR_REPONAME
           echo dlrow olleh
           echo https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER}
           CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`

From 6069b766880ae0067f83cd70ccb92f82a3531d21 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:13:33 +0000
Subject: [PATCH 08/18] Changed circleci 6

---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7f9a111..59c1c2e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,17 +21,17 @@ jobs:
 
       - run: |
           echo hello world
-          git branch 
-          echo $CIRCLE_PULL_REQUESTS
-          echo ${CIRCLE_PROJECT_USERNAME}
-          echo ${CIRCLE_PROJECT_REPONAME}
-          echo ${CIRCLE_PR_NUMBER}
-          echo $CIRCLE_PR_REPONAME
-          echo dlrow olleh
-          echo https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER}
-          CIRCLE_PR_BRANCH=`curl -s https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pulls/${CIRCLE_PR_NUMBER} | jq -r '.head.ref'`
-          echo $CIRCLE_PR_BRANCH
-
+          IS_SIGNEDOFF=$(git log -1 --pretty=%B | grep "Signed-off-by:")
+          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
+          if [ "${CURRENT_BRANCH}" = "develop" ]; then
+            echo "Checking whether signed"
+            if [ ! -z "${IS_SIGNEDOFF}" ]; then
+              echo "Commit is signedoff"
+            else
+              echo "Commit is not signedoff"
+            fi
+          fi
 
       - run: cd public-interface; npm install
 

From a3cdd106d298d91888d854c7eaece01a91d2ee29 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:35:48 +0000
Subject: [PATCH 09/18] Changed circleci 6

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59c1c2e1..b2c14c16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,8 @@ jobs:
 
       - run: |
           echo hello world
-          IS_SIGNEDOFF=$(git log -1 --pretty=%B | grep "Signed-off-by:")
+          IS_SIGNEDOFF=`git log -1 --pretty=%B | grep "Signed-off-by:")`
+          echo hello world2
           CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
           echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
           if [ "${CURRENT_BRANCH}" = "develop" ]; then

From f0c88401aafbb27a71824503c6c5401e82a62106 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:39:34 +0000
Subject: [PATCH 10/18] Changed circleci 6

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2c14c16..aa556d6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
 
       - run: |
           echo hello world
-          IS_SIGNEDOFF=`git log -1 --pretty=%B | grep "Signed-off-by:")`
+          IS_SIGNEDOFF=`git log -1 --pretty=%B | grep "Signed-off-by:"`
           echo hello world2
           CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
           echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}

From 83d455e435758054bb16eeb01f9376836fd56b22 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:41:31 +0000
Subject: [PATCH 11/18] Changed circleci 7

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa556d6a..bdbe8aab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
 
       - run: |
           echo hello world
-          IS_SIGNEDOFF=`git log -1 --pretty=%B | grep "Signed-off-by:"`
+          IS_SIGNEDOFF=`git log -1 --pretty=%B`
           echo hello world2
           CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
           echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}

From bc048add03f2ca3980779644aba81a6abc241515 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:49:02 +0000
Subject: [PATCH 12/18] Changed circleci 8

---
 .circleci/config.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bdbe8aab..0928d3c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,20 +19,22 @@ jobs:
     steps:
       - checkout
 
-      - run: |
-          echo hello world
-          IS_SIGNEDOFF=`git log -1 --pretty=%B`
-          echo hello world2
-          CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-          echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
-          if [ "${CURRENT_BRANCH}" = "develop" ]; then
-            echo "Checking whether signed"
-            if [ ! -z "${IS_SIGNEDOFF}" ]; then
-              echo "Commit is signedoff"
-            else
-              echo "Commit is not signedoff"
+      - run:
+          name: Check whether signedoff
+          command: |
+            echo hello world
+            IS_SIGNEDOFF=`git log -1 --pretty=%B`
+            echo hello world2
+            CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+            echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
+            if [ "${CURRENT_BRANCH}" = "develop" ]; then
+              echo "Checking whether signed"
+              if [ ! -z "${IS_SIGNEDOFF}" ]; then
+                echo "Commit is signedoff"
+              else
+                echo "Commit is not signedoff"
+              fi
             fi
-          fi
 
       - run: cd public-interface; npm install
 

From 45938ba70932deeeb182e840f3f6b00954dad4ee Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:53:59 +0000
Subject: [PATCH 13/18] Changed circleci 9

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0928d3c6..2917d12f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
             echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
             if [ "${CURRENT_BRANCH}" = "develop" ]; then
               echo "Checking whether signed"
-              if [ ! -z "${IS_SIGNEDOFF}" ]; then
+              if [[ "${IS_SIGNEDOFF}" == *Signed-off-by:*@* ]]; then
                 echo "Commit is signedoff"
               else
                 echo "Commit is not signedoff"

From bcdda3076c7a47899ed78d28892f79d34cb1d426 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 14:56:20 +0000
Subject: [PATCH 14/18] Changed circleci 10

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2917d12f..8d6f45f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,9 @@ jobs:
       # - image: circleci/mongo:3.4.4
 
     working_directory: ~/repo
+    environment:
+      shell: /bin/bash
+      TERM: xterm
 
     steps:
       - checkout

From 23117a707cb6dca73bda26383461ce54bda6478a Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 15:01:32 +0000
Subject: [PATCH 15/18] Changed circleci 11

---
 .circleci/config.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d6f45f2..4176ad50 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,21 +25,24 @@ jobs:
       - run:
           name: Check whether signedoff
           command: |
-            echo hello world
             IS_SIGNEDOFF=`git log -1 --pretty=%B`
-            echo hello world2
-            CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-            echo ${CURRENT_BRANCH} xxxxx ${IS_SIGNEDOFF}
-            if [ "${CURRENT_BRANCH}" = "develop" ]; then
-              echo "Checking whether signed"
-              if [[ "${IS_SIGNEDOFF}" == *Signed-off-by:*@* ]]; then
-                echo "Commit is signedoff"
-              else
-                echo "Commit is not signedoff"
-              fi
+            echo "Checking whether signed"
+            if [[ "${IS_SIGNEDOFF}" == *Signed-off-by:*@* ]]; then
+              echo "Commit is signedoff"
+            else
+              echo "Commit is not signedoff"
             fi
+            
 
-      - run: cd public-interface; npm install
+      - run:
+          name: Install dependencies
+          command: |
+            cd public-interface
+            npm install
 
       # run tests!
-      - run: cd public-interface;  node_modules/grunt-cli/bin/grunt build-api
+      - run:
+          name: Run linting and tests
+          command: |
+            cd public-interface
+            node_modules/grunt-cli/bin/grunt build-api

From f5928a38d548ac47eacc58ea95dfffb5d73b9802 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 15:05:52 +0000
Subject: [PATCH 16/18] Changed circleci 11

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4176ad50..82439eca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
       - checkout
 
       - run:
-          name: Check whether signedoff
+          name: Check whether most recent commit is signedoff
           command: |
             IS_SIGNEDOFF=`git log -1 --pretty=%B`
             echo "Checking whether signed"
@@ -31,6 +31,7 @@ jobs:
               echo "Commit is signedoff"
             else
               echo "Commit is not signedoff"
+              exit 1
             fi
             
 

From f1103dbd3711bb3268e7e42373fcf75a475f9bca Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 15:11:26 +0000
Subject: [PATCH 17/18] Changed circleci 10

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82439eca..4eb4f2aa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,7 @@ jobs:
 
       - run:
           name: Check whether most recent commit is signedoff
+          shell: /bin/bash
           command: |
             IS_SIGNEDOFF=`git log -1 --pretty=%B`
             echo "Checking whether signed"
@@ -36,6 +37,7 @@ jobs:
             
 
       - run:
+          shell: /bin/bash
           name: Install dependencies
           command: |
             cd public-interface
@@ -43,6 +45,7 @@ jobs:
 
       # run tests!
       - run:
+          shell: /bin/bash
           name: Run linting and tests
           command: |
             cd public-interface

From e3bbb9dc457a6b9236e2914f5d55da7b8cab3f6f Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Fri, 29 Mar 2019 15:13:03 +0000
Subject: [PATCH 18/18] Changed circleci 11

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4eb4f2aa..f89e15ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,9 +26,9 @@ jobs:
           name: Check whether most recent commit is signedoff
           shell: /bin/bash
           command: |
-            IS_SIGNEDOFF=`git log -1 --pretty=%B`
+            MESSAGE=`git log -1 --pretty=%B`
             echo "Checking whether signed"
-            if [[ "${IS_SIGNEDOFF}" == *Signed-off-by:*@* ]]; then
+            if [[ "${MESSAGE}" == *Signed-off-by:*@* ]]; then
               echo "Commit is signedoff"
             else
               echo "Commit is not signedoff"