merge #273 - Release prep
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/390c1777 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/390c1777 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/390c1777 Branch: refs/heads/master Commit: 390c17773fdeb5cd1676ca9d5c7a7cf63e06c009 Parents: da77199 a04bc80 Author: Andy Taylor <[email protected]> Authored: Thu Dec 17 16:00:25 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Thu Dec 17 16:00:25 2015 +0000 ---------------------------------------------------------------------- docs/README.md | 7 +++++++ docs/user-manual/en/configuration-index.md | 2 +- docs/user-manual/en/perf-tuning.md | 17 ++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
