PYROS-IRAP / pyros

Commit 326d9e3a7fb48418cffe9ebd140a4ad06833d3f5

Authored by haribo
2 parents 3fbab223 217149a4
Exists in master and in 1 other branch dev

Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git

Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
Inline Side-by-side
install/REQUIREMENTS_WINDOWS.txt
  Diff comments   View file @326d9e3
@@ -23,4 +23,4 @@ six==1.10.0 @@ -23,4 +23,4 @@ six==1.10.0
23 sqlparse==0.1.19 23 sqlparse==0.1.19
24 Twisted==16.0.0 24 Twisted==16.0.0
25 virtualenv==15.0.1 25 virtualenv==15.0.1
26 -zope.interface==4.1.1 26 -zope.interface==4.1.1
  27 +zope.interface==4.1.1
27 \ No newline at end of file 28 \ No newline at end of file
src/fixtures/alert_mgr_test.json
  Diff comments   View file @326d9e3
@@ -355,8 +355,7 @@ @@ -355,8 +355,7 @@
355 "error_radius": null, 355 "error_radius": null,
356 "defly_not_grb": false, 356 "defly_not_grb": false,
357 "editor": null, 357 "editor": null,
358 - "soln_status": null,  
359 - "pkt_ser_num": null 358 + "flag": null
360 } 359 }
361 },{ 360 },{
362 "model": "pyrosapp.request", 361 "model": "pyrosapp.request",