diff options
| author | Kaushal M <kaushal@redhat.com> | 2016-11-18 15:32:08 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2016-11-18 15:32:08 +0530 |
| commit | 94ba6c9995d3122f31cad2f4993ab07cd6ae7063 (patch) | |
| tree | 6d5612c63e43da29ac19ff8c28377bd99a8ff9a4 /xlators/mgmt/glusterd/src/Makefile.am | |
| parent | c11131fcdf47c4f0144b0ee1709e8c4bb05dac08 (diff) | |
| parent | a4ecc73a5cd7029dd5ad4a8545a4ec41365ffce9 (diff) | |
Merge remote-tracking branch 'origin/release-3.7' into release-3.7
Due to a mistake done when tagging and pushing v3.7.17, v3.7.17 and
release-3.7 divereged, leaving the release-3.7 branch without the
v3.7.17 commit and tag. This merge resolves the divergence.
More information can about this is available in [1].
[1]: https://www.gluster.org/pipermail/maintainers/2016-November/001746.html
Diffstat (limited to 'xlators/mgmt/glusterd/src/Makefile.am')
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 57a85d554e9..2cd1d85a7c5 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -30,7 +30,7 @@ endif noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ glusterd-sm.h glusterd-store.h glusterd-mem-types.h \ glusterd-pmap.h glusterd-volgen.h glusterd-mountbroker.h \ - glusterd-syncop.h glusterd-hooks.h glusterd-locks.h \ + glusterd-syncop.h glusterd-hooks.h glusterd-locks.h glusterd-quota.h \ glusterd-mgmt.h glusterd-messages.h glusterd-peer-utils.h \ glusterd-statedump.h glusterd-snapshot-utils.h glusterd-geo-rep.h \ glusterd-conn-mgmt.h glusterd-conn-helper.h glusterd-proc-mgmt.h \ |