diff --git a/configure b/configure
index 9b5ffe6125f28d78398b4a911c35980152827c38..d4c02a9d7a58003b02b086f5f93850559f0e52cb 100755
--- a/configure
+++ b/configure
@@ -25169,7 +25169,7 @@ $as_echo "${x_ac_deprecated=no}" >&6; }
-ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/lua/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/plugins/openapi/v0.0.35/Makefile src/slurmrestd/plugins/openapi/v0.0.36/Makefile src/slurmrestd/plugins/openapi/v0.0.37/Makefile src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/rsmi/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/none/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_common/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile"
+ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/seff/Makefile contribs/torque/Makefile contribs/openlava/Makefile contribs/sgather/Makefile contribs/sgi/Makefile contribs/sjobexit/Makefile contribs/pmi/Makefile contribs/pmi2/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/lua/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/salloc/Makefile src/sbatch/Makefile src/sbcast/Makefile src/sattach/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/sprio/Makefile src/squeue/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/none/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/rsmi/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/none/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_filesystem/none/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/acct_gather_profile/none/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/generic/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/none/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/core_spec/none/Makefile src/plugins/cred/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/ext_sensors/none/Makefile src/plugins/gpu/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mps/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/none/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/launch/Makefile src/plugins/launch/slurm/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/none/Makefile src/plugins/mcs/user/Makefile src/plugins/node_features/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/openapi/Makefile src/plugins/openapi/v0.0.35/Makefile src/plugins/openapi/v0.0.36/Makefile src/plugins/openapi/v0.0.37/Makefile src/plugins/openapi/dbv0.0.36/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/power/none/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/route/Makefile src/plugins/route/default/Makefile src/plugins/route/topology/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_common/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/none/Makefile src/plugins/slurmctld/Makefile src/plugins/slurmctld/nonstop/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/none/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/hypercube/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile"
cat >confcache <<\_ACEOF
@@ -26502,11 +26502,6 @@ do
"src/slurmrestd/plugins/auth/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/Makefile" ;;
"src/slurmrestd/plugins/auth/jwt/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/jwt/Makefile" ;;
"src/slurmrestd/plugins/auth/local/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/auth/local/Makefile" ;;
- "src/slurmrestd/plugins/openapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.35/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.35/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.36/Makefile" ;;
- "src/slurmrestd/plugins/openapi/v0.0.37/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/v0.0.37/Makefile" ;;
- "src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile" ;;
"src/sprio/Makefile") CONFIG_FILES="$CONFIG_FILES src/sprio/Makefile" ;;
"src/squeue/Makefile") CONFIG_FILES="$CONFIG_FILES src/squeue/Makefile" ;;
"src/srun/Makefile") CONFIG_FILES="$CONFIG_FILES src/srun/Makefile" ;;
@@ -26611,6 +26606,11 @@ do
"src/plugins/node_features/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/Makefile" ;;
"src/plugins/node_features/knl_cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/knl_cray/Makefile" ;;
"src/plugins/node_features/knl_generic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/node_features/knl_generic/Makefile" ;;
+ "src/plugins/openapi/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/Makefile" ;;
+ "src/plugins/openapi/v0.0.35/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.35/Makefile" ;;
+ "src/plugins/openapi/v0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.36/Makefile" ;;
+ "src/plugins/openapi/v0.0.37/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/v0.0.37/Makefile" ;;
+ "src/plugins/openapi/dbv0.0.36/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/openapi/dbv0.0.36/Makefile" ;;
"src/plugins/power/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/Makefile" ;;
"src/plugins/power/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/common/Makefile" ;;
"src/plugins/power/cray_aries/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/power/cray_aries/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index d0036023d553329bd379fdf88fc38123823dc47c..3b9b0b45812a9c8ead1025200a120d3904f409c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,11 +448,6 @@ AC_CONFIG_FILES([Makefile
src/slurmrestd/plugins/auth/Makefile
src/slurmrestd/plugins/auth/jwt/Makefile
src/slurmrestd/plugins/auth/local/Makefile
- src/slurmrestd/plugins/openapi/Makefile
- src/slurmrestd/plugins/openapi/v0.0.35/Makefile
- src/slurmrestd/plugins/openapi/v0.0.36/Makefile
- src/slurmrestd/plugins/openapi/v0.0.37/Makefile
- src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile
src/sprio/Makefile
src/squeue/Makefile
src/srun/Makefile
@@ -557,6 +552,11 @@ AC_CONFIG_FILES([Makefile
src/plugins/node_features/Makefile
src/plugins/node_features/knl_cray/Makefile
src/plugins/node_features/knl_generic/Makefile
+ src/plugins/openapi/Makefile
+ src/plugins/openapi/v0.0.35/Makefile
+ src/plugins/openapi/v0.0.36/Makefile
+ src/plugins/openapi/v0.0.37/Makefile
+ src/plugins/openapi/dbv0.0.36/Makefile
src/plugins/power/Makefile
src/plugins/power/common/Makefile
src/plugins/power/cray_aries/Makefile
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f50414893a520c9b66e6c754508c3a7529b3d71a..322c7d4477688dc3a34d128745f4a768d8b34334 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS = \
mcs \
mpi \
node_features \
+ openapi \
power \
preempt \
prep \
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 4593996cc94f2232948b415a520a5850562a1e80..43cdc9c473d0c785fb61154ee5e6127b0973cf5b 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -472,6 +472,7 @@ SUBDIRS = \
mcs \
mpi \
node_features \
+ openapi \
power \
preempt \
prep \
diff --git a/src/slurmrestd/plugins/openapi/Makefile.am b/src/plugins/openapi/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/Makefile.am
rename to src/plugins/openapi/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/Makefile.in b/src/plugins/openapi/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/Makefile.in
rename to src/plugins/openapi/Makefile.in
index 0f037005781a6202392e7e67093327341eeee8e5..1ee4d11d5506f15d10c5bdd8451528f1befb4ef4 100644
--- a/src/slurmrestd/plugins/openapi/Makefile.in
+++ b/src/plugins/openapi/Makefile.in
@@ -88,7 +88,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi
+subdir = src/plugins/openapi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -462,9 +462,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/slurmrestd/plugins/openapi/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/openapi/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/slurmrestd/plugins/openapi/Makefile
+ $(AUTOMAKE) --gnu src/plugins/openapi/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/LICENSE-openapi.json b/src/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
rename to src/plugins/openapi/dbv0.0.36/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.am b/src/plugins/openapi/dbv0.0.36/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.am
rename to src/plugins/openapi/dbv0.0.36/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in b/src/plugins/openapi/dbv0.0.36/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in
rename to src/plugins/openapi/dbv0.0.36/Makefile.in
index 8254e6a0e8531e6260e48fca40f454484e08b534..afde820be9de014b82cc06af5661cb505425aaf2 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile.in
+++ b/src/plugins/openapi/dbv0.0.36/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/dbv0.0.36
+subdir = src/plugins/openapi/dbv0.0.36
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -540,9 +540,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/dbv0.0.36/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/dbv0.0.36/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/dbv0.0.36/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c b/src/plugins/openapi/dbv0.0.36/accounts.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c
rename to src/plugins/openapi/dbv0.0.36/accounts.c
index a5a40eee703749f490637f94a2500c16c31f96ed..fa653d640a53a9e50744e2543b28e0d60b46453c 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/accounts.c
+++ b/src/plugins/openapi/dbv0.0.36/accounts.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_ACCOUNT 0xaefefef0
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.c b/src/plugins/openapi/dbv0.0.36/api.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/api.c
rename to src/plugins/openapi/dbv0.0.36/api.c
index ae899c8e47b70bd1d060a8ec42f815ee638fe0ae..12694ab527da9422b48d784db2c73760ce310858 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.c
+++ b/src/plugins/openapi/dbv0.0.36/api.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.h b/src/plugins/openapi/dbv0.0.36/api.h
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/api.h
rename to src/plugins/openapi/dbv0.0.36/api.h
index d5b58636f11315dec5af3a9199ecb588063072bf..8084cdeb10758a5bccf84319e5583ccbad15bdbc 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/api.h
+++ b/src/plugins/openapi/dbv0.0.36/api.h
@@ -46,7 +46,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h"
+#include "src/plugins/openapi/dbv0.0.36/parse.h"
#define CONFIG_OP_TAG 0xfffffffe
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c b/src/plugins/openapi/dbv0.0.36/associations.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c
rename to src/plugins/openapi/dbv0.0.36/associations.c
index e05697ff15973a10f61015adfd440bc5dc2d5215..091f592ee9289d570f523c26251f8a9a0bb0cd0d 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/associations.c
+++ b/src/plugins/openapi/dbv0.0.36/associations.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static int _foreach_delete_assoc(void *x, void *arg)
{
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c b/src/plugins/openapi/dbv0.0.36/cluster.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c
rename to src/plugins/openapi/dbv0.0.36/cluster.c
index 113a22812d02159be510af3c776fbf9adba0674a..f142b9b18ae2fbc8d375732e664b1d4846320b0f 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/cluster.c
+++ b/src/plugins/openapi/dbv0.0.36/cluster.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_CLUSTER 0x2aa2faf2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/config.c b/src/plugins/openapi/dbv0.0.36/config.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/config.c
rename to src/plugins/openapi/dbv0.0.36/config.c
index 9fe4fd4e745255f6b5db815ed8b8e65df7c78dd3..434e0bd4108598f6dcc879865d66206c61e4a839 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/config.c
+++ b/src/plugins/openapi/dbv0.0.36/config.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static const operation_handler_t ops[] = {
/* Warning: order matters */
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c b/src/plugins/openapi/dbv0.0.36/diag.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c
rename to src/plugins/openapi/dbv0.0.36/diag.c
index 4c4aeb7bd8eec8ef4c1ff4a58a750f542b5bdf85..2b988817a5021a656a39a4c9faf8a3d624d0e26a 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/diag.c
+++ b/src/plugins/openapi/dbv0.0.36/diag.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/* based on sacctmgr_list_stats() */
static int _op_handler_diag(const char *context_id,
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c b/src/plugins/openapi/dbv0.0.36/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c
rename to src/plugins/openapi/dbv0.0.36/jobs.c
index 63c9a6337625b084a534b1292e97c6eaa29838b8..4e2a8b553aeab1728f3c6d79b23986f0b5f204a4 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/jobs.c
+++ b/src/plugins/openapi/dbv0.0.36/jobs.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_JOB 0xf8aefef3
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/openapi.json b/src/plugins/openapi/dbv0.0.36/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/openapi.json
rename to src/plugins/openapi/dbv0.0.36/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c b/src/plugins/openapi/dbv0.0.36/parse.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c
rename to src/plugins/openapi/dbv0.0.36/parse.c
index cd69676b5caf5fca8244720e9b6e6e48dc5c255c..dc6869927fd178190b83bb1268cbd99b4f4b8a5d 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.c
+++ b/src/plugins/openapi/dbv0.0.36/parse.c
@@ -52,7 +52,7 @@
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
/*
* WARNING: parser uses a ton of macros to avoid massive amounts of copy and
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h b/src/plugins/openapi/dbv0.0.36/parse.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/parse.h
rename to src/plugins/openapi/dbv0.0.36/parse.h
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c b/src/plugins/openapi/dbv0.0.36/qos.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c
rename to src/plugins/openapi/dbv0.0.36/qos.c
index af5fdafc189f9a25f9257f6a89bce29001db406c..72320fc38d23ae4955d301b3216928d8788739ad 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/qos.c
+++ b/src/plugins/openapi/dbv0.0.36/qos.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
enum {
TAG_ALL_QOS = 0,
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c b/src/plugins/openapi/dbv0.0.36/tres.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c
rename to src/plugins/openapi/dbv0.0.36/tres.c
index 8fd1e2000440a144979b0e4abe704520f24177d2..8460f2e3d26c1d82e268fc578da10d5e516629e2 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/tres.c
+++ b/src/plugins/openapi/dbv0.0.36/tres.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
static int _foreach_dump_tres(void *x, void *arg)
{
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/users.c b/src/plugins/openapi/dbv0.0.36/users.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/users.c
rename to src/plugins/openapi/dbv0.0.36/users.c
index 6516b46766e92bb6649e8c3c2eafc5202e2230de..16b946bbf8fa3304345a71b8c21ee42512362248 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/users.c
+++ b/src/plugins/openapi/dbv0.0.36/users.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_USER 0xa13efef2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c b/src/plugins/openapi/dbv0.0.36/wckeys.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c
rename to src/plugins/openapi/dbv0.0.36/wckeys.c
index 2eb19cff006bfab05c676c5e74f170534117f109..ee45d7cf44f5c9a144699981e7007076cf12cb80 100644
--- a/src/slurmrestd/plugins/openapi/dbv0.0.36/wckeys.c
+++ b/src/plugins/openapi/dbv0.0.36/wckeys.c
@@ -56,7 +56,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/dbv0.0.36/api.h"
+#include "src/plugins/openapi/dbv0.0.36/api.h"
#define MAGIC_FOREACH_WCKEY 0xb3a2faf2
typedef struct {
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/LICENSE-openapi.json b/src/plugins/openapi/v0.0.35/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.35/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.am b/src/plugins/openapi/v0.0.35/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/Makefile.am
rename to src/plugins/openapi/v0.0.35/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in b/src/plugins/openapi/v0.0.35/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in
rename to src/plugins/openapi/v0.0.35/Makefile.in
index 14d16336942a7aa8fbfed6fb1a67b3918042eafd..2db5584b4fb7c50841fd58874cc2129d248dfde7 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.35/Makefile.in
+++ b/src/plugins/openapi/v0.0.35/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.35
+subdir = src/plugins/openapi/v0.0.35
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.35/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.35/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.35/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.35/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/api.c b/src/plugins/openapi/v0.0.35/api.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/api.c
rename to src/plugins/openapi/v0.0.35/api.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/diag.c b/src/plugins/openapi/v0.0.35/diag.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/diag.c
rename to src/plugins/openapi/v0.0.35/diag.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/jobs.c b/src/plugins/openapi/v0.0.35/jobs.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/jobs.c
rename to src/plugins/openapi/v0.0.35/jobs.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/nodes.c b/src/plugins/openapi/v0.0.35/nodes.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/nodes.c
rename to src/plugins/openapi/v0.0.35/nodes.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/openapi.json b/src/plugins/openapi/v0.0.35/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/openapi.json
rename to src/plugins/openapi/v0.0.35/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.35/partitions.c b/src/plugins/openapi/v0.0.35/partitions.c
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.35/partitions.c
rename to src/plugins/openapi/v0.0.35/partitions.c
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/LICENSE-openapi.json b/src/plugins/openapi/v0.0.36/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.36/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.am b/src/plugins/openapi/v0.0.36/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/Makefile.am
rename to src/plugins/openapi/v0.0.36/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in b/src/plugins/openapi/v0.0.36/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in
rename to src/plugins/openapi/v0.0.36/Makefile.in
index 18eb83745e5db2869fa9aac83fba90c31d3b8a2e..bc935b17663a84021e8a5a90e08d133bed7f05d1 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/Makefile.in
+++ b/src/plugins/openapi/v0.0.36/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.36
+subdir = src/plugins/openapi/v0.0.36
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.36/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.36/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.36/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.36/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/api.c b/src/plugins/openapi/v0.0.36/api.c
similarity index 98%
rename from src/slurmrestd/plugins/openapi/v0.0.36/api.c
rename to src/plugins/openapi/v0.0.36/api.c
index ec7b3ac9c51c5acaf841a3113dfbaa5b6810dd34..54531bde42237b132f84566c7014fac96ae564b8 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/api.c
+++ b/src/plugins/openapi/v0.0.36/api.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/api.h b/src/plugins/openapi/v0.0.36/api.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/api.h
rename to src/plugins/openapi/v0.0.36/api.h
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/diag.c b/src/plugins/openapi/v0.0.36/diag.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/diag.c
rename to src/plugins/openapi/v0.0.36/diag.c
index 6fae3239492a2a4b90baafb012590d1048f35406..d63f4570f71ad81c65842b19864a3505cff9aec6 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/diag.c
+++ b/src/plugins/openapi/v0.0.36/diag.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/jobs.c b/src/plugins/openapi/v0.0.36/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/jobs.c
rename to src/plugins/openapi/v0.0.36/jobs.c
index 2b29cc3258251613c4e187e647a34ab34dd66dd2..66788d291db90556d136b9a1d1c9a60a0abdb47f 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/jobs.c
+++ b/src/plugins/openapi/v0.0.36/jobs.c
@@ -66,7 +66,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef struct {
const char *param;
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/nodes.c b/src/plugins/openapi/v0.0.36/nodes.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/nodes.c
rename to src/plugins/openapi/v0.0.36/nodes.c
index daf0097b1393193ab4ff4388477ee5daa7af1531..bc5486b97accb91a2af2bc60b061195c39fd6b4f 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/nodes.c
+++ b/src/plugins/openapi/v0.0.36/nodes.c
@@ -54,7 +54,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/openapi.json b/src/plugins/openapi/v0.0.36/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.36/openapi.json
rename to src/plugins/openapi/v0.0.36/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.36/partitions.c b/src/plugins/openapi/v0.0.36/partitions.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.36/partitions.c
rename to src/plugins/openapi/v0.0.36/partitions.c
index b035851fb2e34181bfbef08281134742081c1c95..c6f55424aade8002cf191ad6893fc5162174c6c5 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.36/partitions.c
+++ b/src/plugins/openapi/v0.0.36/partitions.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.36/api.h"
+#include "src/plugins/openapi/v0.0.36/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/LICENSE-openapi.json b/src/plugins/openapi/v0.0.37/LICENSE-openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/LICENSE-openapi.json
rename to src/plugins/openapi/v0.0.37/LICENSE-openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.am b/src/plugins/openapi/v0.0.37/Makefile.am
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/Makefile.am
rename to src/plugins/openapi/v0.0.37/Makefile.am
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in b/src/plugins/openapi/v0.0.37/Makefile.in
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in
rename to src/plugins/openapi/v0.0.37/Makefile.in
index 82417463584d01cdee2d3025e45580e8cdc41a0e..eead6f7b5857f08ad79c1cbf776b957c7daae6b1 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/Makefile.in
+++ b/src/plugins/openapi/v0.0.37/Makefile.in
@@ -91,7 +91,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/slurmrestd/plugins/openapi/v0.0.37
+subdir = src/plugins/openapi/v0.0.37
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/ax_check_compile_flag.m4 \
$(top_srcdir)/auxdir/ax_gcc_builtin.m4 \
@@ -534,9 +534,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.37/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.37/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/slurmrestd/plugins/openapi/v0.0.37/Makefile
+ $(AUTOMAKE) --foreign src/plugins/openapi/v0.0.37/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/api.c b/src/plugins/openapi/v0.0.37/api.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/api.c
rename to src/plugins/openapi/v0.0.37/api.c
index 5c8169f24ce119eaff9c625b775d02e396bd198a..4a525f584b9c9e0a84e5e54f42d051ea4f14bc93 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/api.c
+++ b/src/plugins/openapi/v0.0.37/api.c
@@ -51,7 +51,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
/*
* These variables are required by the generic plugin interface. If they
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/api.h b/src/plugins/openapi/v0.0.37/api.h
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/api.h
rename to src/plugins/openapi/v0.0.37/api.h
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/diag.c b/src/plugins/openapi/v0.0.37/diag.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/diag.c
rename to src/plugins/openapi/v0.0.37/diag.c
index 8fbffd7c0ee0666e368e0b9619b89f6dbb7103c4..63c54d856267e9dbc4e5ff9454e33675f8d8fde2 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/diag.c
+++ b/src/plugins/openapi/v0.0.37/diag.c
@@ -50,7 +50,7 @@
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/jobs.c b/src/plugins/openapi/v0.0.37/jobs.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/jobs.c
rename to src/plugins/openapi/v0.0.37/jobs.c
index bb24a139c3e0de77e49d060f19f83ca2b589e480..f460829ad95dc8fe9f081a19a0c600794258c9e9 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/jobs.c
+++ b/src/plugins/openapi/v0.0.37/jobs.c
@@ -66,7 +66,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef struct {
const char *param;
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/nodes.c b/src/plugins/openapi/v0.0.37/nodes.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/nodes.c
rename to src/plugins/openapi/v0.0.37/nodes.c
index 4c6822980fb027bc1fb8ac5ad3bafbda5993ab9a..8177991dfbbd8ba4c4f457c1c94472858acb05b7 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/nodes.c
+++ b/src/plugins/openapi/v0.0.37/nodes.c
@@ -55,7 +55,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/openapi.json b/src/plugins/openapi/v0.0.37/openapi.json
similarity index 100%
rename from src/slurmrestd/plugins/openapi/v0.0.37/openapi.json
rename to src/plugins/openapi/v0.0.37/openapi.json
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/partitions.c b/src/plugins/openapi/v0.0.37/partitions.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/partitions.c
rename to src/plugins/openapi/v0.0.37/partitions.c
index 6e5202b14bd7143efb78b139dc82c75c5cc4b9d9..3eaa4f6fb1aca6920b838c13a0d95316d959f163 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/partitions.c
+++ b/src/plugins/openapi/v0.0.37/partitions.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/openapi/v0.0.37/reservations.c b/src/plugins/openapi/v0.0.37/reservations.c
similarity index 99%
rename from src/slurmrestd/plugins/openapi/v0.0.37/reservations.c
rename to src/plugins/openapi/v0.0.37/reservations.c
index 5d8fab86f15e1c70cc49abf4faf92b0eba2970c6..a33e127705ec726996eb496ab37cf62ecda50346 100644
--- a/src/slurmrestd/plugins/openapi/v0.0.37/reservations.c
+++ b/src/plugins/openapi/v0.0.37/reservations.c
@@ -52,7 +52,7 @@
#include "src/slurmrestd/openapi.h"
#include "src/slurmrestd/operations.h"
-#include "src/slurmrestd/plugins/openapi/v0.0.37/api.h"
+#include "src/plugins/openapi/v0.0.37/api.h"
typedef enum {
URL_TAG_UNKNOWN = 0,
diff --git a/src/slurmrestd/plugins/Makefile.am b/src/slurmrestd/plugins/Makefile.am
index fcbac0cd001d63c494c42278e3146af96de71605..5937cbb3b347a8c2afe70c0c4186177a387d48d7 100644
--- a/src/slurmrestd/plugins/Makefile.am
+++ b/src/slurmrestd/plugins/Makefile.am
@@ -1,3 +1,3 @@
if WITH_SLURMRESTD
-SUBDIRS = openapi auth
+SUBDIRS = auth
endif
diff --git a/src/slurmrestd/plugins/Makefile.in b/src/slurmrestd/plugins/Makefile.in
index 8f60911296eeb42967de6e52c37cb442e4904a67..bc261cfa5e2a565bbdd411761417b3fac09e8a14 100644
--- a/src/slurmrestd/plugins/Makefile.in
+++ b/src/slurmrestd/plugins/Makefile.in
@@ -195,7 +195,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = openapi auth
+DIST_SUBDIRS = auth
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -449,7 +449,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@WITH_SLURMRESTD_TRUE@SUBDIRS = openapi auth
+@WITH_SLURMRESTD_TRUE@SUBDIRS = auth
all: all-recursive
.SUFFIXES: