Commit Graph

97 Commits

Author SHA1 Message Date
Jean-Sébastien Pédron 635c99dba5
Merge branch 'stable' 2016-12-07 13:38:20 +01:00
Jean-Sébastien Pédron 2c83f8915d
plugins.mk: The list is overriden by the server-release Concourse pipeline
[#131643765]
2016-12-07 13:34:12 +01:00
Jean-Sébastien Pédron 3ad6519ad2
plugins.mk: Sort list alphabetically 2016-12-07 13:31:54 +01:00
Jean-Sébastien Pédron e368f6283f
upgrade/Makefile: Remove trailing space 2016-12-07 13:26:09 +01:00
Jean-Sébastien Pédron a9cc7496c5
Debian package: No need to pass $(VERSION) around in debian/rules
The source disttribution is responsible for its own version string.

[#131643765]
[#130992027]
2016-12-07 13:05:34 +01:00
Jean-Sébastien Pédron 0ebaf287b8
Makefile: Use echo instead of printf
echo adds a newline character by default and we don't need the features
of printf here.

[#131643765]
2016-12-07 12:18:37 +01:00
Jean-Sébastien Pédron 5058c9ca3e
Makefile: Store the plugins list in the source archive
We override the default $(PLUGINS) with the one specified from the
command line, or with the same value if nothing was specified.

This makes sure that the source archive doesn't try to fetch plugins
which were not listed when it was created.

[#131643765]
2016-12-07 11:31:19 +01:00
Jean-Sébastien Pédron b40686fdc2
Makefile: Move plugins list to `plugins.mk`
[#131643765]
2016-12-07 11:20:41 +01:00
Jean-Sébastien Pédron 99391a5ac1
Makefile: Call $(MAKE), not plain `make` 2016-12-07 11:17:07 +01:00
Jean-Sébastien Pédron 9e0cf9581c
Update rabbitmq-components.mk 2016-12-06 16:36:41 +01:00
Jean-Sébastien Pédron c096bd8f70
Update rabbitmq-components.mk
Remove PROJECT_VERSION computation from Makefile: rabbitmq-components.mk
takes care of it.

[#130992027]
2016-12-06 13:37:00 +01:00
Jean-Sébastien Pédron d959a26f55
Makefile: Sync exclusion list with rabbitmq-erlang-client
[#130992027]
2016-12-05 19:39:09 +01:00
Jean-Sébastien Pédron d02792b089
Makefile: Use PROJECT_DESCRIPTION in git-revisions.txt
[#130992027]
2016-12-05 19:34:50 +01:00
Jean-Sébastien Pédron bcf0ae038e
Makefile: Set default `broker_version_requirements`
This only replaces an existing but empty `broker_version_requirements`
so it's fine in the 3.6.x branch where the parameter is never set. And
even if it is present, it would not be used by the broker so it is
harmless.

[#130992027]
2016-12-05 18:15:51 +01:00
Jean-Sébastien Pédron 052dffff92
Makefile: Use $(PROJECT_VERSION) instead of $(VERSION)
This is the variable expected and used by Erlang.mk

When working from Git, the variable can be specified on the command
line. This is particularily useful when using `make run-broker` or `make
source-dist`.

When working from the source archive created by `make source-dist`, the
version is taken from `git-revisions.txt`, a file created during the
creation of the source archive. If the variable is specified on the
command line as well, it takes precedence over the one in
`git-revisions.txt`, like any Makefile variables.

[#130992027]
2016-12-05 17:18:19 +01:00
Michael Klishin e18f65e79f
Merge branch 'stable' 2016-11-29 21:19:52 +03:00
Michael Klishin 0d02553e26
Update rabbitmq-components.mk 2016-11-29 20:59:38 +03:00
Daniil Fedotov b02de8cd22 Use rabbitmqctl wait to wait for upgrade 2016-11-29 16:18:07 +00:00
Michael Klishin 5a006bc1a8 rabbitmq_management_visualiser is gone for good
We cannot remove it in 3.6.x but it's really time for it to go.
It has been effectively unmaintained (and very much unused)
since at least 2012. In fact, it has always been experimental
and it wasn't a very good idea to include it into the distribution
in the first place.

We cannot continue carrying this dead weight forever.

Per discussion with other team members.
2016-11-25 17:29:29 +03:00
Michael Klishin d4e7a94aca Trigger a Travis build 2016-11-25 16:53:02 +03:00
Michael Klishin 1fdef10495 Trigger a Travis build 2016-11-25 16:52:53 +03:00
Michael Klishin 618f3a9208
Merge branch 'stable'
Conflicts:
	.travis.yml
2016-11-25 15:40:45 +03:00
Michael Klishin 1702ab6967 Merge pull request #9 from bogdando/stable
Add Travis tests for Pacemaker OCF RA cluster
2016-11-25 15:39:49 +03:00
Michael Klishin 9d8012d1a9
Merge branch 'stable' 2016-11-25 15:35:01 +03:00
Michael Klishin ac45b6f198 Include rabbitmq_web_mqtt into the distribution
Per discussion with team RabbitMQ and the broader Pivotal team.
2016-11-25 15:31:39 +03:00
Bogdan Dobrelya c785c6f298 Add Travis tests for Pacemaker OCF RA cluster
Add a matrix of two test cases:
* Smoke test: just a check if rabbit cluster assembles.
* Jepsen test: allowed to fail, it's main value is to
  verify cluster auto-healing after consequent network
  partitions and to provide numbers for
  duplicated/lost/recovered/unexpected messages as well.
* Pin the cluster installer repo to the 1.2.0.

Backport from master branch

Make the gate always passing if there is no changes found
to the RabbitMQ OCF RA script in the patch under test.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
2016-11-25 13:31:39 +01:00
Michael Klishin 8e1b1a24ec Merge pull request #8 from bogdando/travis_ocf_ra
Add Travis tests for Pacemaker OCF RA cluster
2016-11-25 15:21:58 +03:00
Bogdan Dobrelya c5ba6d0218 Add Travis tests for Pacemaker OCF RA cluster
Add a matrix of two test cases:
* Smoke test: just a check if rabbit cluster assembles.
* Jepsen test: allowed to fail, it's main value is to
  verify cluster auto-healing after consequent network
  partitions and to provide numbers for
  duplicated/lost/recovered/unexpected messages as well.

Make the gate always passing if there is no changes found
to the RabbitMQ OCF RA script in the patch under test.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
2016-11-25 12:56:14 +01:00
Jean-Sébastien Pédron 41e6c5abc8
Merge branch 'stable' 2016-11-25 11:49:00 +01:00
Jean-Sébastien Pédron 70e7279006
Update rabbitmq-components.mk 2016-11-25 10:51:01 +01:00
Jean-Sébastien Pédron c6085c116b
Merge branch 'stable' 2016-11-25 10:37:22 +01:00
Jean-Sébastien Pédron 58ff565525
Update rabbitmq-components.mk 2016-11-25 10:08:22 +01:00
Michael Klishin 63666c6aa8 Merge pull request #7 from rabbitmq/rabbitmq-common-139
Rename mochinum and mochiweb_util
2016-11-24 22:11:14 +03:00
Loïc Hoguin b267249a3b
Rename mochinum and mochiweb_util 2016-11-24 16:28:21 +01:00
Jean-Sébastien Pédron 6afcbc253d
Update rabbitmq-components.mk 2016-11-23 18:06:06 +01:00
Gerhard Lazu 8307dd454e Merge branch 'stable' 2016-11-22 16:54:29 +00:00
Gerhard Lazu afd1d17f7a Update erlang.mk 2016-11-22 16:20:08 +00:00
Gerhard Lazu d0291bf0c8 Update rabbitmq-components.mk 2016-11-22 16:16:40 +00:00
Michael Klishin 613a49fecb
Merge branch 'stable' 2016-11-22 13:06:00 +03:00
Michael Klishin 4a1d67edbe Commit Debian and RPM changelogs 2016-11-21 10:53:00 +00:00
Jean-Sébastien Pédron b6425eff0c
debian/control: Require Erlang 18.3 2016-11-18 16:03:38 +01:00
Jean-Sébastien Pédron a70f96d778
Update erlang.mk 2016-11-14 11:57:58 +01:00
Jean-Sébastien Pédron 5724cddd79
Update rabbitmq-components.mk 2016-11-10 16:56:48 +01:00
Michael Klishin a4f98de9c0 Merge pull request #6 from rabbitmq/rabbitmq-common-46
Update mochiweb copyright files
2016-11-09 18:46:33 +03:00
Jean-Sébastien Pédron e0cedc45c4
Merge branch 'rabbitmq-cli-integration' 2016-11-08 19:10:22 +01:00
Jean-Sébastien Pédron fd88b57863
Merge branch 'stable' 2016-11-08 19:09:57 +01:00
Jean-Sébastien Pédron ad4565fa57
packaging: Specify source directory in RPM 2016-11-08 18:37:45 +01:00
Jean-Sébastien Pédron d3e2fc6c4f
packaging: Distinguish upstream and package versions in RPM 2016-11-08 18:31:31 +01:00
Jean-Sébastien Pédron ac243bfe61
packaging: Be sure to name RPM source archive correctly 2016-11-08 16:20:21 +01:00
Jean-Sébastien Pédron 5ff79cd849
packaging: Be sure to name RPM source archive correctly 2016-11-08 16:04:30 +01:00