Merge branch 'develop' of https://github.com/eclipse-iofog/Controller

Saeid Rezaei Baghbidi · Saeid Rezaei Baghbidi · commit bfbcc13057cd · 2019-07-01T21:08:50.000-07:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
 trigger:
   tags:
     include:
-      - v.*
+      - v*
   branches:
     include:
       - develop
@@ -10,10 +10,6 @@ trigger:
     exclude:
       - README.md
 
-pr:
-  - master
-  - develop
-
 variables:
   group: 'pipelines'
   repository: 'focal-freedom-236620/controller'
@@ -52,12 +48,7 @@ jobs:
 
       - script: |
           echo "npm test"
-        displayName: 'integration tests'
-
-      - script: |
-          echo "##vso[task.setvariable variable=agent.jobstatus;]canceled"
-          echo "##vso[task.complete result=Canceled;]DONE"
-        condition: eq(variables['Build.Reason'], 'PullRequest')
+        displayName: 'integration tests' 
 
       - script: |
           npm pack
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iofogcontroller",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
   "main": "./src/main.js",
   "author": "Saeid Baghbidi",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "iofogcontroller",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",`
`5`	`5`	`"main": "./src/main.js",`
`6`	`6`	`"author": "Saeid Baghbidi",`