US3205 - Adding restart functionality to UI
Switch calling convention to match US3143
Merge pull request #1203 from rmillner/ssl-calling

Merged by openshift-bot
fix references to rhc app cartridge
Merge pull request #1210 from danmcp/master

Merged by openshift-bot
Removing the 'noreplace' macro from the development and production.rb for the console.

These are technically considered code for the Console so we do NOT want
'noreplace' set.  However, since rails developers have a tendency to modify
those files we are labeling them as configuration so that .rpmsave files will
be created whenever a new RPM overwrites changes that have been made.
%post script to fix the realm from any previous install.
separate out console and broker realms per BZ893369
BZ876324 resolve ServerName/NameVirtualHost situation for node/broker/ssl.conf

Conflicts:

	node/rubygem-openshift-origin-node.spec
BZ892909 copying the file to just modify it inplace is a waste of ressource, and a security problem, since the file /tmp/haproxy.cfg.$$ has a predictible name and there is no check to see if it already exist or if it was changed between sed and cat ( or cat and cp ). A attacker with access to /tmp could just create directory with the same name to create a DOS and erase haproxy configuration.

Signed-off-by: Chris Alfonso <calfonso@redhat.com>
BZ896406 - warning message when installing rubygem-openshift-origin-node

Conflicts:

	node/rubygem-openshift-origin-node.spec
BZ892990 - The server address should not be "localhost" on user account info page
BZ888056 - production.rb should not be marked as a conf file
create DnsService plugin using nsupdate
Automatic commit of package [rubygem-openshift-origin-dns-nsupdate] release [0.0.1-1].
Bug 903564: Fix inconsistent sed when updating haproxy cfg

Make the sed which updates the haproxy cfg on namespace update
work consistently. For some input, the previous regex would
produce an invalid config, causing haproxy to fail to load
during namespace update, aborting the entire operation.

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=903564.
BZ904081
Merge pull request #1152 from jtharris/features/US3205

Merged by openshift-bot
Fix Quota, additional storage validations
Merge pull request #1209 from abhgupta/abhgupta-dev

Merged by openshift-bot