Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BC0F173B7 for ; Mon, 16 Mar 2015 09:42:01 +0000 (UTC) Received: (qmail 37188 invoked by uid 500); 16 Mar 2015 09:42:01 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 37141 invoked by uid 500); 16 Mar 2015 09:42:01 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 37094 invoked by uid 99); 16 Mar 2015 09:42:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2015 09:42:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B31C9E10A9; Mon, 16 Mar 2015 09:42:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Mon, 16 Mar 2015 09:42:04 -0000 Message-Id: <6eadbc4eb96c4e888b97f6c56170616b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] activemq-6 git commit: merge #183 - Few changes around docs and dependencies merge #183 - Few changes around docs and dependencies Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/3bd35d8d Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/3bd35d8d Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/3bd35d8d Branch: refs/heads/master Commit: 3bd35d8d1fc3d4e3c3193c86b5e5674b7d198d74 Parents: ab1c585 0cf2a56 Author: Andy Taylor Authored: Mon Mar 16 09:41:18 2015 +0000 Committer: Andy Taylor Committed: Mon Mar 16 09:41:18 2015 +0000 ---------------------------------------------------------------------- activemq-rest/pom.xml | 35 + docs/user-manual/en/configuration-index.md | 2097 +++--------------- docs/user-manual/en/message-expiry.md | 2 +- docs/user-manual/en/persistence.md | 2 +- docs/user-manual/en/rest.md | 63 +- docs/user-manual/en/security.md | 2 +- docs/user-manual/en/tools.md | 17 +- docs/user-manual/en/undelivered-messages.md | 4 +- docs/user-manual/en/using-jms.md | 39 +- examples/jms/rest/dup-send/pom.xml | 12 + examples/jms/rest/javascript-chat/pom.xml | 12 + examples/jms/rest/jms-to-rest/pom.xml | 12 + examples/jms/rest/push/pom.xml | 12 + .../activemq-aerogear-integration/pom.xml | 6 + 14 files changed, 413 insertions(+), 1902 deletions(-) ----------------------------------------------------------------------