Merge branch 'dev' into gs_master

GsDevKit · Jun 2, 2015 · dfe52b3 · dfe52b3
2 parents d16405a + ba36981
commit dfe52b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/processes.st b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/instance/processes.st
@@ -1,5 +1,5 @@
 private
 processes
-	^ (Process allSubInstances
-		reject: [ :each | each isTerminated or: [ each = Processor activeProcess ] ])
-		sorted: [ :a :b | a priority >= b priority ]
+  ^ (ProcessorScheduler scheduler allProcesses
+    reject: [ :each | each isTerminated or: [ each = Processor activeProcess ] ])
+    sorted: [ :a :b | a priority >= b priority ]
diff --git a/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/methodProperties.json b/repository/Zinc-HTTP.package/ZnDefaultServerDelegate.class/methodProperties.json
@@ -19,7 +19,7 @@
 		"initialize" : "SvenVanCaekenberghe 12/23/2012 17:52",
 		"map:to:" : "SvenVanCaekenberghe 8/21/2012 10:35",
 		"prefixMap" : "SvenVanCaekenberghe 8/21/2012 10:36",
-		"processes" : "SvenVanCaekenberghe 3/31/2011 09:46",
+		"processes" : "dkh 06/02/2015 15:20",
 		"random:" : "SvenVanCaekenberghe 1/4/2011 14:52",
 		"sessionRequest:" : "SvenVanCaekenberghe 11/10/2012 23:41",
 		"status:" : "SvenVanCaekenberghe 3/31/2011 09:18",

diff --git a/repository/Zinc-HTTP.package/monticello.meta/version b/repository/Zinc-HTTP.package/monticello.meta/version