git://git.whamcloud.com - fs/lustre-release.git/commit

Whamcloud - gitweb

author	John L. Hammond <jhammond@whamcloud.com>
	Tue, 27 Apr 2021 14:38:30 +0000 (09:38 -0500)
committer	John L. Hammond <jhammond@whamcloud.com>
	Tue, 27 Apr 2021 14:47:36 +0000 (09:47 -0500)
commit	344ae1e5855bfbdb5acfb93d755419c49ae29ab3
tree	2e50c70a5a5a88f3f1b96c4013f3589613e56ed5	tree \| snapshot
parent	2c3c85fbfd2bfe40234960dd9961bb08e03c9d4a	commit \| diff
parent	dfa0760e7d8c7f5f56ebb5ee2e766f0a05cc4e67	commit \| diff

EX-2921: merge lipe changes from b_es5_2

Merge commit 'dfa0760e7d8c7f5f56ebb5ee2e766f0a05cc4e67' into b_es6_0:

$ git checkout b_es5_2
$ git subtree split --prefix=lipe
8251fae87b508e36caab6397b1063b308dcb2b05
$ git checkout b_es6_0
$ git subtree merge --prefix=lipe --squash 8251fae87b508e36caab6397b1063b308dcb2b05

Signed-off-by: John L. Hammond <jhammond@whamcloud.com>
Change-Id: I864a5d014b8e0528a90052b291401db7ce203cc1

20 files changed:

lipe/Makefile.am	diff1 \|	diff2 \|	blob \| history
lipe/configure.ac	diff1 \|	\|	blob \| history
lipe/hotpools-1.17-release-notes.md	\|	diff2 \|	blob \| history
lipe/lipe-revision.sh	\|	diff2 \|	blob \| history
lipe/lipe.spec.in	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-config.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-convert.sh	\|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-start.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-stop.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-teardown-client.sh	\|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-teardown.sh	diff1 \|	diff2 \|	blob \| history
lipe/src/Makefile.am	diff1 \|	diff2 \|	blob \| history
lipe/src/lamigo.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lamigo_alr.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_ssh.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_ssh.h	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_version.c	\|	diff2 \|	blob \| history
lipe/src/lipe_version.h	\|	diff2 \|	blob \| history
lipe/src/lpurge.c	diff1 \|	diff2 \|	blob \| history
lipe/version-gen.sh	diff1 \|	diff2 \|	blob \| history

Lustre primary development and releases

lipe/Makefile.am	diff1 \|	diff2 \|	blob \| history
lipe/configure.ac	diff1 \|	\|	blob \| history
lipe/hotpools-1.17-release-notes.md	\|	diff2 \|	blob \| history
lipe/lipe-revision.sh	\|	diff2 \|	blob \| history
lipe/lipe.spec.in	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-config.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-convert.sh	\|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-start.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-stop.sh	diff1 \|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-teardown-client.sh	\|	diff2 \|	blob \| history
lipe/scripts/stratagem-hp-teardown.sh	diff1 \|	diff2 \|	blob \| history
lipe/src/Makefile.am	diff1 \|	diff2 \|	blob \| history
lipe/src/lamigo.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lamigo_alr.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_ssh.c	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_ssh.h	diff1 \|	diff2 \|	blob \| history
lipe/src/lipe_version.c	\|	diff2 \|	blob \| history
lipe/src/lipe_version.h	\|	diff2 \|	blob \| history
lipe/src/lpurge.c	diff1 \|	diff2 \|	blob \| history
lipe/version-gen.sh	diff1 \|	diff2 \|	blob \| history