summaryrefslogtreecommitdiff
path: root/qpid/java/jca/example/conf
diff options
context:
space:
mode:
authorWeston M. Price <wprice@apache.org>2012-04-22 22:51:08 +0000
committerWeston M. Price <wprice@apache.org>2012-04-22 22:51:08 +0000
commit0aad8136596154aece13f49368a66388bb0bbda3 (patch)
treedd1c7f4602be2957b4c96e7f477e5fbc46445948 /qpid/java/jca/example/conf
parent48ca9982f8a1697bc47dc253c5656382bc4e3691 (diff)
downloadqpid-python-0aad8136596154aece13f49368a66388bb0bbda3.tar.gz
Merge branch 'QPID-3957' into trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1328987 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/jca/example/conf')
-rw-r--r--qpid/java/jca/example/conf/qpid-standalone.xml (renamed from qpid/java/jca/example/conf/standalone.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/qpid/java/jca/example/conf/standalone.xml b/qpid/java/jca/example/conf/qpid-standalone.xml
index 8d6137aea7..8d6137aea7 100644
--- a/qpid/java/jca/example/conf/standalone.xml
+++ b/qpid/java/jca/example/conf/qpid-standalone.xml