Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

updates diff

  • Loading branch information...
commit 0e7710e147125e44bb642eb85369fe1e8aaf8801 1 parent 82b8adb
Alvaro Videla authored

Showing 1 changed file with 39 additions and 41 deletions. Show diff stats Hide diff stats

  1. +39 41 release.branch.diff
80 release.branch.diff
... ... @@ -1,6 +1,6 @@
1   -diff -r 60755ae0eee9 -r 2545616b505b Makefile
  1 +diff -r 60755ae0eee9 -r 611b26fd4b1b Makefile
2 2 --- a/Makefile Thu Apr 12 18:38:34 2012 +0100
3   -+++ b/Makefile Fri Apr 20 01:51:11 2012 +0200
  3 ++++ b/Makefile Fri Apr 20 02:41:53 2012 +0200
4 4 @@ -62,6 +62,12 @@
5 5 TARBALL_NAME=rabbitmq-server-$(VERSION)
6 6 TARGET_SRC_DIR=dist/$(TARBALL_NAME)
@@ -56,7 +56,7 @@ diff -r 60755ae0eee9 -r 2545616b505b Makefile
56 56 +# add minimal boot file
57 57 + cp $(ERTS_ROOT_DIR)/bin/start_clean.boot $(RLS_DIR)/releases/$(VERSION)
58 58 +# add README file
59   -+ sed 's/%%VSN%%/$(VERSION)/' pre-release/templates/README > $(RLS_DIR)/README
  59 ++ cp pre-release/templates/README > $(RLS_DIR)/README
60 60 +# add LICENSE files
61 61 + cp LICENSE LICENSE-MPL-RabbitMQ $(RLS_DIR)
62 62 +# add VERSION file
@@ -74,9 +74,9 @@ diff -r 60755ae0eee9 -r 2545616b505b Makefile
74 74 srcdist: distclean
75 75 mkdir -p $(TARGET_SRC_DIR)/codegen
76 76 cp -r ebin src include LICENSE LICENSE-MPL-RabbitMQ INSTALL README $(TARGET_SRC_DIR)
77   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/scripts/make_rel
  77 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/scripts/make_rel
78 78 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
79   -+++ b/pre-release/scripts/make_rel Fri Apr 20 01:51:11 2012 +0200
  79 ++++ b/pre-release/scripts/make_rel Fri Apr 20 02:41:53 2012 +0200
80 80 @@ -0,0 +1,25 @@
81 81 +#!/bin/sh
82 82 +
@@ -104,49 +104,47 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/scripts/make_rel
104 104 + -s rabbit_release \
105 105 + -extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_HOME}"
106 106 \ No newline at end of file
107   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/README
  107 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/README
108 108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
109   -+++ b/pre-release/templates/README Fri Apr 20 01:51:11 2012 +0200
110   -@@ -0,0 +1,29 @@
  109 ++++ b/pre-release/templates/README Fri Apr 20 02:41:53 2012 +0200
  110 +@@ -0,0 +1,27 @@
111 111 +# NOTE: This is an unofficial release not supported by the RabbitMQ team #
112 112 +
113   -+Running RabbitMQ
  113 ++## Starting RabbitMQ ##
114 114 +
115   -+Before running the server do:
  115 ++ $ ./bin/start_server
116 116 +
117   -+ $ ./bin/post_install.sh
  117 ++## Stoping RabbitMQ ##
118 118 +
119   -+That script will set the right path for the Erlang runtime that is distributed with this package.
  119 ++ $ ./bin/stop_server
120 120 +
121   -+Then to run the server do:
  121 ++## Configuration ##
122 122 +
123   -+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmq-server
  123 ++The server user and password are the default ones `guest:guest`
124 124 +
125   -+If you want to run the server in the background the do:
  125 ++This release comes with the Management Plugin already installed. To use it open http://localhost:55672
126 126 +
127   -+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmq-server -detached
  127 ++## Documentation ##
128 128 +
129   -+To stop the server run:
  129 ++For documentation see:
130 130 +
131   -+ $ ./lib/rabbit-%%VSN%%/sbin/rabbitmqctl stop
  131 ++[http://www.rabbitmq.com/documentation.html](http://www.rabbitmq.com/documentation.html).
132 132 +
133   -+This release comes with the Management Plugin already installed. To use it open http://localhost:55672
  133 ++# LICENSE #
134 134 +
135   -+The server user and passwords are the default ones `guest:guest`
136   -+
137   -+For documentation see:
  135 ++This work is licensed under the Mozilla Public License as stated here: [http://www.rabbitmq.com/mpl.html](http://www.rabbitmq.com/mpl.html).
138 136 +
139   -+http://www.rabbitmq.com/documentation.html
  137 ++The Erlang ERTS is distributed according to the Erlang Public License: [http://www.erlang.org/EPLICENSE](http://www.erlang.org/EPLICENSE).
140 138 \ No newline at end of file
141   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/enabled_plugins
  139 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/enabled_plugins
142 140 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
143   -+++ b/pre-release/templates/enabled_plugins Fri Apr 20 01:51:11 2012 +0200
  141 ++++ b/pre-release/templates/enabled_plugins Fri Apr 20 02:41:53 2012 +0200
144 142 @@ -0,0 +1,1 @@
145 143 +[rabbitmq_management].
146 144 \ No newline at end of file
147   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/post_install.sh
  145 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/post_install.sh
148 146 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
149   -+++ b/pre-release/templates/post_install.sh Fri Apr 20 01:51:11 2012 +0200
  147 ++++ b/pre-release/templates/post_install.sh Fri Apr 20 02:41:53 2012 +0200
150 148 @@ -0,0 +1,6 @@
151 149 +#!/bin/sh
152 150 +ROOT="`pwd`"
@@ -154,9 +152,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/post_install.sh
154 152 +sed s:%FINAL_ROOTDIR%:\""${ROOT}"\": $DIR/erl.src > $DIR/erl.tmp
155 153 +sed s:\$BINDIR:\"\$BINDIR\": $DIR/erl.tmp > $DIR/erl
156 154 +rm $DIR/erl.tmp
157   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-defaults
  155 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-defaults
158 156 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
159   -+++ b/pre-release/templates/rabbitmq-defaults Fri Apr 20 01:51:11 2012 +0200
  157 ++++ b/pre-release/templates/rabbitmq-defaults Fri Apr 20 02:41:53 2012 +0200
160 158 @@ -0,0 +1,34 @@
161 159 +#!/bin/sh
162 160 +## The contents of this file are subject to the Mozilla Public License
@@ -193,9 +191,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-defaults
193 191 +BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start"
194 192 +GENERIC_BOOT_FILE="${SYS_PREFIX}/releases/${RELEASE_VERSION}/start_clean"
195 193 \ No newline at end of file
196   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-env
  194 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-env
197 195 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
198   -+++ b/pre-release/templates/rabbitmq-env Fri Apr 20 01:51:11 2012 +0200
  196 ++++ b/pre-release/templates/rabbitmq-env Fri Apr 20 02:41:53 2012 +0200
199 197 @@ -0,0 +1,51 @@
200 198 +#!/bin/sh
201 199 +## The contents of this file are subject to the Mozilla Public License
@@ -248,9 +246,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-env
248 246 +
249 247 +## Get configuration variables from the configure environment file
250 248 +[ -f "${CONF_ENV_FILE}" ] && . "${CONF_ENV_FILE}"
251   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-server
  249 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmq-server
252 250 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
253   -+++ b/pre-release/templates/rabbitmq-server Fri Apr 20 01:51:11 2012 +0200
  251 ++++ b/pre-release/templates/rabbitmq-server Fri Apr 20 02:41:53 2012 +0200
254 252 @@ -0,0 +1,109 @@
255 253 +#!/bin/sh
256 254 +## The contents of this file are subject to the Mozilla Public License
@@ -361,9 +359,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmq-server
361 359 + ${RABBITMQ_SERVER_START_ARGS} \
362 360 + "$@"
363 361 +
364   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmqctl
  362 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/rabbitmqctl
365 363 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
366   -+++ b/pre-release/templates/rabbitmqctl Fri Apr 20 01:51:11 2012 +0200
  364 ++++ b/pre-release/templates/rabbitmqctl Fri Apr 20 02:41:53 2012 +0200
367 365 @@ -0,0 +1,40 @@
368 366 +#!/bin/sh
369 367 +## The contents of this file are subject to the Mozilla Public License
@@ -405,9 +403,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/rabbitmqctl
405 403 + -s rabbit_control \
406 404 + -nodename $RABBITMQ_NODENAME \
407 405 + -extra "$@"
408   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/start_server
  406 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/start_server
409 407 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
410   -+++ b/pre-release/templates/start_server Fri Apr 20 01:51:11 2012 +0200
  408 ++++ b/pre-release/templates/start_server Fri Apr 20 02:41:53 2012 +0200
411 409 @@ -0,0 +1,30 @@
412 410 +#!/bin/sh
413 411 +EPMD_ROOT=./%%ERTS_VSN%%/bin
@@ -440,9 +438,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/start_server
440 438 +
441 439 +exit 0
442 440 \ No newline at end of file
443   -diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/stop_server
  441 +diff -r 60755ae0eee9 -r 611b26fd4b1b pre-release/templates/stop_server
444 442 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
445   -+++ b/pre-release/templates/stop_server Fri Apr 20 01:51:11 2012 +0200
  443 ++++ b/pre-release/templates/stop_server Fri Apr 20 02:41:53 2012 +0200
446 444 @@ -0,0 +1,25 @@
447 445 +#!/bin/sh
448 446 +EPMD_ROOT=./%%ERTS_VSN%%/bin
@@ -469,9 +467,9 @@ diff -r 60755ae0eee9 -r 2545616b505b pre-release/templates/stop_server
469 467 +done
470 468 +
471 469 +"${EPMD_ROOT}"/epmd -names | grep -q name || epmd -kill > /dev/null
472   -diff -r 60755ae0eee9 -r 2545616b505b src/rabbit_release.erl
  470 +diff -r 60755ae0eee9 -r 611b26fd4b1b src/rabbit_release.erl
473 471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
474   -+++ b/src/rabbit_release.erl Fri Apr 20 01:51:11 2012 +0200
  472 ++++ b/src/rabbit_release.erl Fri Apr 20 02:41:53 2012 +0200
475 473 @@ -0,0 +1,185 @@
476 474 +-module(rabbit_release).
477 475 +

0 comments on commit 0e7710e

Please sign in to comment.
Something went wrong with that request. Please try again.