diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-08-18 12:17:34 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-08-18 12:17:34 +0300 |
| commit | 754feab6936ff1954964bf04423a2758899b91dc (patch) | |
| tree | d4d72c1ef7e84d994c52805a955e38d6967efd99 /packaging | |
| parent | dad8511a6409816d3d8012fdb70213122bb690e4 (diff) | |
| parent | 9f1c12f8ab553aab2da435f82a805da8b08c9149 (diff) | |
| download | rabbitmq-server-git-754feab6936ff1954964bf04423a2758899b91dc.tar.gz | |
Merge branch 'master' into rabbitmq-server-500-squashed
Conflicts:
src/rabbit_control_main.erl
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index 31b85d9c1f..02820bdb23 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -46,7 +46,7 @@ ifeq ($(SOURCE_DIST_FILE),) $(error Cannot find source archive; please specify SOURCE_DIST_FILE) endif ifneq ($(words $(SOURCE_DIST_FILE)),1) -$(error Multile source archives found; please specify SOURCE_DIST_FILE) +$(error Multiple source archives found; please specify SOURCE_DIST_FILE) endif ifeq ($(filter %.tar.xz %.txz,$(SOURCE_DIST_FILE)),) $(error The source archive must a tar.xz archive) |