[openshift-origin-broker] update to latest release

Fri Jul 26 22:02:08 UTC 2013

commit ed02a7840b1996097894432bdf29c62cc225ad03
Author: Troy Dawson <tdawson at redhat.com>
Date:   Fri Jul 26 17:01:43 2013 -0500

    update to latest release

 .gitignore                   |    1 +
 openshift-origin-broker.spec |  124 ++++++++++++++++++++++++++++++++++++++++--
 sources                      |    2 +-
 3 files changed, 120 insertions(+), 7 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index cef65fc..16a27ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /openshift-origin-broker-1.4.1.tar.gz
 /openshift-origin-broker-1.5.1.tar.gz
 /openshift-origin-broker-1.5.2.tar.gz
+/openshift-origin-broker-1.10.2.tar.gz
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index 65ea0e8..a80ab87 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -9,10 +9,10 @@
 
 Summary:       OpenShift Origin broker components
 Name:          openshift-origin-broker
-Version:       1.5.2
+Version:       1.10.2
 Release:       1%{?dist}
 License:       ASL 2.0
-URL:           http://openshift.redhat.com
+URL:           http://www.openshift.com
 Source0:       http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
 # Example blank favicon - upstream currently does not ship one 
 Source1:       %{name}.favicon
@@ -20,13 +20,11 @@ Patch1:        openshift-origin-broker-1.5.2-gemfile-dependancies.patch
 Requires:      httpd
 Requires:      bind
 Requires:      mod_ssl
-Requires:      mongodb-server
 Requires:      openshift-origin-util
 Requires:      policycoreutils-python
 Requires:      rubygem(openshift-origin-controller)
 Requires:      %{?scl:%scl_prefix}mod_passenger
 Requires:      %{?scl:%scl_prefix}rubygem(bson_ext)
-Requires:      %{?scl:%scl_prefix}rubygem(cucumber)
 Requires:      %{?scl:%scl_prefix}rubygem(dnsruby)
 Requires:      %{?scl:%scl_prefix}rubygem(json)
 Requires:      %{?scl:%scl_prefix}rubygem(minitest)
@@ -81,6 +79,7 @@ mkdir -p %{buildroot}%{brokerdir}/tmp/sockets
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_sysconfdir}/openshift
+mkdir -p %{buildroot}%{_sysconfdir}/openshift/plugins.d
 
 cp -rp . %{buildroot}%{brokerdir}
 %if %{with_systemd}
@@ -101,6 +100,7 @@ mkdir -p %{buildroot}%{_var}/log/openshift/broker/httpd
 cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker.conf
 cp -p conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker-dev.conf
 cp conf/quickstarts.json %{buildroot}%{_sysconfdir}/openshift/quickstarts.json
+cp conf/plugins.d/README %{buildroot}%{_sysconfdir}/openshift/plugins.d/README
 
 %if 0%{?fedora} >= 18
 mv %{buildroot}%{brokerdir}/httpd/httpd.conf.apache-2.4 %{buildroot}%{brokerdir}/httpd/httpd.conf
@@ -138,7 +138,7 @@ systemctl --system daemon-reload
 # command line tools that will load the Rails environment and create the logs
 # as root.  We need the files labeled %ghost because we don't want these log
 # files overwritten on RPM upgrade.
-for l in %{_var}/log/openshift/user_action.log %{_var}/log/openshift/broker/{development,production}.log; do
+for l in %{_var}/log/openshift/broker/{development,production,user_action,usage}.log; do
   if [ ! -f $l ]; then
     touch $l
   fi
@@ -154,7 +154,8 @@ done
 %dir %attr(0750,-,-) %{_var}/log/openshift/broker/httpd
 %attr(0644,-,-) %ghost %{_var}/log/openshift/broker/production.log
 %attr(0644,-,-) %ghost %{_var}/log/openshift/broker/development.log
-%attr(0644,-,-) %ghost %{_var}/log/openshift/user_action.log
+%attr(0644,-,-) %ghost %{_var}/log/openshift/broker/user_action.log
+%attr(0644,-,-) %ghost %{_var}/log/openshift/broker/usage.log
 %{brokerdir}
 %{htmldir}/broker
 %config %{brokerdir}/config/environments/production.rb
@@ -164,6 +165,8 @@ done
 %config(noreplace) %{_sysconfdir}/openshift/broker.conf
 %config(noreplace) %{_sysconfdir}/openshift/quickstarts.json
 %{_sysconfdir}/openshift/broker-dev.conf
+%doc %{_sysconfdir}/openshift/plugins.d/README
+%dir %{_sysconfdir}/openshift/plugins.d
 
 %defattr(-,root,root,-)
 %if %{with_systemd}
@@ -174,6 +177,115 @@ done
 %endif
 
 %changelog
+* Tue Jun 11 2013 Troy Dawson <tdawson at redhat.com> 1.10.2-1
+- <broker.conf> default to usage db tracking on (lmeyer at redhat.com)
+- Print warning instead of failing tests if there is an unknown auth plugin
+  configured (kraman at gmail.com)
+- Include psych gem only on F19 systems where it has been split out
+  (kraman at gmail.com)
+- Update broker tests with new versions of packages for F19 Fix bug where test
+  was not creating user on before using it (kraman at gmail.com)
+- Create usage.log when broker is installed (kraman at gmail.com)
+- Relax rake and mocha gem version dependencies (kraman at gmail.com)
+- origin_runtime_138 - Add SSL_ENDPOINT variable and filter whether carts use
+  ssl_to_gear. (rmillner at redhat.com)
+- Merge pull request #2740 from danmcp/master
+  (dmcphers+openshiftbot at redhat.com)
+- fix sanity tests (dmcphers at redhat.com)
+- return HTTP Status code 200 from DELETE instead of 204 (lnader at redhat.com)
+- Fixing alias tests (abhgupta at redhat.com)
+- vendoring of cartridges (rchopra at redhat.com)
+- Merge pull request #2576 from rajatchopra/master
+  (dmcphers+openshiftbot at redhat.com)
+- fix to cartridge cache test (rchopra at redhat.com)
+- Removing externally_reserved_uids_size attribute from districts
+  (abhgupta at redhat.com)
+- enable downloading of cartridges (rchopra at redhat.com)
+- Bug 963981 - Fix app events controller Use canonical_name/canonical_namespace
+  for application/domain respectively when using find_by op.
+  (rpenta at redhat.com)
+- Add fault tolerance code to UsageRecord model (rpenta at redhat.com)
+- Merge pull request #2481 from smarterclayton/add_param_for_downloadable_carts
+  (dmcphers at redhat.com)
+- Mocha should be constrained (ccoleman at redhat.com)
+- Bug 963156 (dmcphers at redhat.com)
+- Merge pull request #2424 from smarterclayton/upgrade_to_mocha_0_13_3
+  (admiller at redhat.com)
+- Add 'cartridges[][url]' as an optional parameter on ADD_APPLICATION and 'url'
+  as an optional parameter on ADD_CARTRIDGE (ccoleman at redhat.com)
+- Merge pull request #2450 from lnader/master
+  (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #2426 from abhgupta/abhgupta-dev
+  (dmcphers+openshiftbot at redhat.com)
+- Added API for cartridge search (lnader at redhat.com)
+- Switching v2 to be the default (dmcphers at redhat.com)
+- Removing code dealing with namespace updates for applications
+  (abhgupta at redhat.com)
+- Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12) (ccoleman at redhat.com)
+- Allow broker to be run in source mode and load source plugins
+  (ccoleman at redhat.com)
+- Broker requires parse config newer than 1.0.1 (ccoleman at redhat.com)
+- <broker><oo-accept-broker> Bug 958674 - Fix Mongo SSL support
+  (jdetiber at redhat.com)
+- Remove last external reference (ccoleman at redhat.com)
+- Merge remote-tracking branch 'origin/master' into support_external_cartridges
+  (ccoleman at redhat.com)
+- Rename "external cartridge" to "downloaded cartridge".  UI should call them
+  "personal" cartridges (ccoleman at redhat.com)
+- Merge pull request #2300 from pravisankar/dev/ravi/card21
+  (dmcphers+openshiftbot at redhat.com)
+- Broker changes for supporting unsubscribe connection event. Details: When one
+  of the component is removed from the app and if it has published some content
+  to other components located on different gears, we issue unsubscribe event on
+  all the subscribing gears to cleanup the published content.
+  (rpenta at redhat.com)
+- Merge pull request #2306 from
+  smarterclayton/bug_958192_document_auth_scope_config
+  (dmcphers+openshiftbot at redhat.com)
+- Bug 958192 - Document scopes in config (ccoleman at redhat.com)
+- Use standard name for boolean (ccoleman at redhat.com)
+- Merge remote-tracking branch 'origin/master' into support_external_cartridges
+  (ccoleman at redhat.com)
+- Card 551 (lnader at redhat.com)
+- <broker> Bug 956351 - Add mongo rubygem dependency, docs (jolamb at redhat.com)
+- Merge pull request #2282 from rajatchopra/url_story
+  (dmcphers+openshiftbot at redhat.com)
+- support for external cartridge through urls (rchopra at redhat.com)
+- Removed 'setmaxstorage' option for oo-admin-ctl-user script. Added
+  'setmaxtrackedstorage' and 'setmaxuntrackedstorage' options for oo-admin-ctl-
+  user script. Updated oo-admin-ctl-user man page. Max allowed additional fs
+  storage for user will be 'max_untracked_addtl_storage_per_gear' capability +
+  'max_tracked_addtl_storage_per_gear' capability. Don't record usage for
+  additional fs storage if it is less than
+  'max_untracked_addtl_storage_per_gear' limit. Fixed unit tests and models to
+  accommodate the above change. (rpenta at redhat.com)
+- Merge remote-tracking branch 'origin/master' into support_external_cartridges
+  (ccoleman at redhat.com)
+- Bug 956670 - Fix static references to small gear size (jdetiber at redhat.com)
+- Merge pull request #2219 from detiber/useractionlogfix
+  (dmcphers+openshiftbot at redhat.com)
+- Add broker config for external cartridges (ccoleman at redhat.com)
+- <broker> Updated spec file for correct user_action.log location <oo-accept-
+  broker> Added permission check for rest api logs (jdetiber at redhat.com)
+- General REST API clean up - centralizing log tags and getting common objects
+  (lnader at redhat.com)
+- Merge pull request #2062 from Miciah/move-plugins.d-README-from-node-to-
+  broker (dmcphers+openshiftbot at redhat.com)
+- Bug 928675 (asari.ruby at gmail.com)
+- Merge pull request #2111 from brenton/specs3
+  (dmcphers+openshiftbot at redhat.com)
+- Removing the MongoDB dependency from the Broker rpm spec
+  (bleanhar at redhat.com)
+- Merge pull request #2080 from brenton/specs2
+  (dmcphers+openshiftbot at redhat.com)
+- Move to minitest 3.5.0, webmock 1.8.11, and mocha 0.12.10
+  (ccoleman at redhat.com)
+- Cucumber is not a runtime requirement for the Broker (bleanhar at redhat.com)
+- Move plugins.d/README from the node to the broker (miciah.masters at gmail.com)
+
+* Tue Jun 11 2013 Troy Dawson <tdawson at redhat.com> 1.10.1-1
+- Bump up version to 1.10
+
 * Sat Apr 13 2013 Krishna Raman <kraman at gmail.com> 1.5.2-1
 - Fixing broker and nsupdate plugin deps (bleanhar at redhat.com)
 - Replace zend with ruby in broker function test as zend is not available on
diff --git a/sources b/sources
index 63a3579..085e9c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fcf786cb9aa88413230c8c3d8f54ee63  openshift-origin-broker-1.5.2.tar.gz
+388d4b3da96c58a76d184c9356a39da6  openshift-origin-broker-1.10.2.tar.gz
