Permalink
Browse files

Globally change hg_id to git_id

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
  • Loading branch information...
1 parent 8701f1a commit fe7f60fe02989344089e5f423488be6205d051a7 Mike McClurg committed Nov 29, 2011
Showing with 7 additions and 7 deletions.
  1. +1 −1 Makefile
  2. +1 −1 ocaml/util/version.mli
  3. +1 −1 ocaml/xapi/xapi.ml
  4. +1 −1 ocaml/xapi/xapi_config.ml
  5. +2 −2 ocaml/xapi/xapi_globs.ml
  6. +1 −1 ocaml/xapi/xapi_pool.ml
View
2 Makefile
@@ -78,7 +78,7 @@ api-libs-doc:
.PHONY: version
version:
@printf "(* This file is autogenerated. Grep for e17512ce-ba7c-11df-887b-0026b9799147 (random uuid) to see where it comes from. ;o) *) \n \
- let hg_id = \"$(shell git show-ref --head | grep -E ' HEAD$$' | cut -f 1 -d ' ')\" \n \
+ let git_id = \"$(shell git show-ref --head | grep -E ' HEAD$$' | cut -f 1 -d ' ')\" \n \
let hostname = \"$(shell hostname)\" \n \
let date = \"$(shell date -u +%Y-%m-%d)\" \n \
let product_version = \"$(PRODUCT_VERSION)\" \n \
View
2 ocaml/util/version.mli
@@ -1,4 +1,4 @@
-val hg_id : string
+val git_id : string
val hostname : string
val date : string
val product_version : string
View
2 ocaml/xapi/xapi.ml
@@ -226,7 +226,7 @@ let daemonize = ref false
let show_version () =
List.iter (fun (x, y) -> printf "%s=%s\n" x y)
- [ "hg_id", Version.hg_id;
+ [ "git_id", Version.git_id;
"hostname", Version.hostname;
"date", Version.date;
"PRODUCT_VERSION", Version.product_version;
View
2 ocaml/xapi/xapi_config.ml
@@ -116,6 +116,6 @@ let dump_config () =
debug "product_version: %s" Version.product_version;
debug "product_brand: %s" Version.product_brand;
debug "build_number: %s" Version.build_number;
- debug "hg changeset: %s" Version.hg_id;
+ debug "git changeset: %s" Version.git_id;
debug "version: %d.%d" version_major version_minor;
(* debug "License filename: %s" !License_file.filename *)
View
4 ocaml/xapi/xapi_globs.ml
@@ -123,7 +123,7 @@ let _product_version_text_short = "product_version_text_short"
let _platform_version = "platform_version"
let _product_brand = "product_brand"
let _build_number = "build_number"
-let _hg_id = "hg_id"
+let _git_id = "git_id"
let _api_major = "API_major"
let _api_minor = "API_minor"
let _api_vendor = "API_vendor"
@@ -145,7 +145,7 @@ let software_version = [ _product_version, Version.product_version;
_platform_version, Version.platform_version;
_product_brand, Version.product_brand;
_build_number, Version.build_number;
- _hg_id, Version.hg_id;
+ _git_id, Version.git_id;
_hostname, Version.hostname;
_date, Version.date]
View
2 ocaml/xapi/xapi_pool.ml
@@ -188,7 +188,7 @@ let pre_join_checks ~__context ~rpc ~session_id ~force =
begin try List.assoc "product_version" fields with _ -> "" end,
begin try List.assoc "product_brand" fields with _ -> "" end,
begin try List.assoc "build_number" fields with _ -> "" end,
- begin try List.assoc "hg_id" fields with _ -> "" end,
+ begin try List.assoc "git_id" fields with _ -> "" end,
begin try
if List.mem_assoc Xapi_globs.linux_pack_vsn_key fields then "installed"
else "not present"

0 comments on commit fe7f60f

Please sign in to comment.