Sync changes to upstream

gabelevi · gabelevi · commit 5b73bc6e6959 · 2015-04-16T15:30:05.000-07:00
diff --git a/src/commands/statusCommands.ml b/src/commands/statusCommands.ml
@@ -78,7 +78,7 @@ module Impl (CommandList : COMMAND_LIST) (Config : CONFIG) = struct
         empty
         |> CommandUtils.server_flags
         |> CommandUtils.json_flags
-        |> dummy None
+        |> anon "root" (optional string) ~doc:"Root directory"
       )
     }
 
diff --git a/src/common/flowConfig.ml b/src/common/flowConfig.ml
@@ -11,7 +11,7 @@
 open Utils
 open Sys_utils
 
-let version = "0.9.0"
+let version = "0.9.1"
 
 type moduleSystem = Node | Haste
 
diff --git a/tests/version/version.exp b/tests/version/version.exp
@@ -1 +1 @@
-.flowconfig:10 Wrong version of Flow. The config specifies version 0.1.0 but this is version 0.9.0
+.flowconfig:10 Wrong version of Flow. The config specifies version 0.1.0 but this is version 0.9.1

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ module Impl (CommandList : COMMAND_LIST) (Config : CONFIG) = struct`
`78`	`78`	`empty`
`79`	`79`	`\|> CommandUtils.server_flags`
`80`	`80`	`\|> CommandUtils.json_flags`
`81`		`- \|> dummy None`
	`81`	`+ \|> anon "root" (optional string) ~doc:"Root directory"`
`82`	`82`	`)`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.flowconfig:10 Wrong version of Flow. The config specifies version 0.1.0 but this is version 0.9.0`
	`1`	`+.flowconfig:10 Wrong version of Flow. The config specifies version 0.1.0 but this is version 0.9.1`