merge xapi-inventory #5382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

psafont merged 61 commits into xapi-project:master from edwintorok:private/edvint/merge-inventory

Jan 31, 2024

Contributor

edwintorok commented Jan 22, 2024

For easier reviewing, this is part of #5378

johnelse and others added 30 commits

March 3, 2013 21:38


          Initial commit

951829c

Signed-off-by: John Else <john.else@citrix.com>


          Remove the almost-redundant inventory_globs.ml

333d600

Signed-off-by: John Else <john.else@citrix.com>


          Update OASIS

a6ed115

Signed-off-by: John Else <john.else@citrix.com>


          Add README.md

d27dc1e

Signed-off-by: John Else <john.else@citrix.com>


          Remove dependency on FHS

39f70ec

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Remove dependency on uuid library

6492ba8

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Remove dependence on log library

d701513

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Use obuild rather than oasis

273a1f3

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Introduce a configure script

4da99f1

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Add standard files.

086f3c1

Signed-off-by: David Scott <dave.scott@eu.citrix.com>


          Merge pull request #1 from djs55/first-release

55ec27b

Add standard files.


          Add Dave to maintainers file.

de8f4d9

This should also test the post commit hook :-)

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>


          Switch to a compiled configure script

29f4382

Signed-off-by: David Scott <dave.scott@eu.citrix.com>


          'make' by itself should build the library, not the configure program

40d32f1

Signed-off-by: David Scott <dave.scott@eu.citrix.com>


          s/Stringext/Xstringext/

c6d25f3

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Merge pull request #2 from jonludlam/great_stringext_rename

2f79954

s/Stringext/Xstringext/


          Add configurable idle timeout to stunnel

13735de

Signed-off-by: Akshay <akshay.ramani@citrix.com>


          Merge pull request #3 from akshayramani/SCTX-1665.f

0200f5a

Add configurable idle timeout to stunnel


          Oasisify. Ossify? No, that's not quite right...

b63b038

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Remove obuild file

ab85988

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Merge pull request #4 from jonludlam/oasisify

2d08cdd

Oasisify. Ossify? No, that's not quite right...


          Fix up the oasis specification to include the autogenerated ml file

5659c00

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Merge pull request xapi-project#5 from jonludlam/fix-oasis

d0ac097

Fix up the oasis specification to include the autogenerated ml file


          CP-12512 New key _stunnel_legacy "STUNNEL_LEGACY"

75d3fc6

Corresponds to Host.ssl_legacy.

This is needed because when a slave starts, it cannot learn its
Host.ssl_legacy without using an stunnel to contact the master to
consult the database.  Therefore a locally stored copy is needed.

Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>


          Merge pull request xapi-project#6 from thomassa/sslinventory

a63afc2

CP-12512 New key _stunnel_legacy "STUNNEL_LEGACY"


          Use packed Stdext

e1992e5

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Add opam, and remove autogenerated stuff

27c37e2

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Merge pull request xapi-project#7 from jonludlam/smapiv3

82e61f9

Use Stdext 2.0.0


          s/1.0.0/1.0.1/ - 1.0.0 had already been released

647ae5e

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>


          Merge pull request xapi-project#8 from jonludlam/version-mixup

f817297

s/1.0.0/1.0.1/ - 1.0.0 had already been released

lindig and others added 27 commits

February 3, 2017 14:23


          Bump version to 1.0.2

300b49a

The previous commit was tagged as v1.0.2 but we forgot to update the
_oasis file and the ChangeLog. This commit adds these changes.

Signed-off-by: Christian Lindig <christian.lindig@citrix.com>


          Merge pull request xapi-project#10 from lindig/master

aa6f8dc

Bump version to 1.0.2


          Sync opam file with xs-opam

Signed-off-by: Gabor Igloi <gabor.igloi@citrix.com>


          Merge pull request xapi-project#11 from gaborigloi/sync_opam

cecd1f6

Sync opam file with xs-opam


          CA-276606: Ported build from _oasis to jbuilder.

c1650dd

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>


          Replace xapi-stdext with xapi-stdext-subpackages and astring.

ff95604

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>


          Reindentation and file mode change.

fc0653a

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>


          Merge pull request xapi-project#12 from kc284/master

ed9ceb2

CA-276606: Ported build from _oasis to jbuilder.


          inventory: preserve old ~limit:2 semantic

28a120f

Signed-off-by: Marcello Seri <marcello.seri@citrix.com>


          Merge pull request xapi-project#13 from mseri/master

6c2270c

inventory: preserve old ~limit:2 semantic


          Ported build to dune and deprecated the old package xcp-inventory.

200c85d

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>


          Removed conflict between xcp-inventory and xapi-inventory.

98f2dc9

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>


          Merge pull request xapi-project#15 from kc284/master

5403f31

Ported build to dune and deprecated the old package xcp-inventory.


          maintenance: fix travis

075e03f

Signed-off-by: lippirk <ben.anson@citrix.com>


          maintenance: use dune instead of jbuilder

a2ae295

Signed-off-by: lippirk <ben.anson@citrix.com>


          maintenance: change default filename to /etc/xensource-inventory

be8eea8

All clients use the filename '/etc/xensource-inventory', so set this to
be the default. This avoids runtime errors when a client has not set the
path.

Signed-off-by: lippirk <ben.anson@citrix.com>


          Merge pull request xapi-project#16 from lippirk/master

94c30ea

Set default inventory path to /etc/xensource-inventory


          maintenance: clean up opam metadata

623348b

xcp-inventory has been deleted because it's unused and the url from
xapi-inventory is removed as it was not being kept up-to-date.

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>


          Merge pull request xapi-project#17 from xapi-project/nourl

82313e8

maintenance: clean up opam metadata


          Add license to opam metadata

b913ef4

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>


          Merge pull request xapi-project#18 from psafont/license

ef3a1f2


          maintenance: Decrease direct usages of Threadext

5a86e84

Its Mutex module is only useful for the function 'execute', use stdlib's
Mutex for all the other functionality

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>


          Merge pull request xapi-project#19 from xapi-project/threading

cf2953c

maintenance: Decrease direct usages of Threadext


          maintenance: prepare for release

7461b57

Fill changelog and add a name to dune-project

Signed-off-by: Pau Ruiz Safont <pau.safont@citrix.com>


          Merge pull request xapi-project#20 from psafont/release

26e78d6


          Add 'ocaml/libs/xapi-inventory/' from commit '26e78d63c9462d86bc79865…

ac3055c

…d91dc8e6c0ef96f99'

And move *.opam files to root, and update install/uninstall rules.

git-subtree-dir: ocaml/libs/xapi-inventory
git-subtree-mainline: d057878
git-subtree-split: 26e78d6


          [maintenance]: make format

87360d5

This was referenced Jan 22, 2024

Merge stdext and reverse deps into XAPI #5378

Merged

Move xapi-rrd, xapi-inventory and xapi-stdext* to xs-extra xapi-project/xs-opam#665

Merged

psafont merged commit 1671c17 into xapi-project:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet