[openshift-origin-broker] update to 1.5.2

Tue Jun 11 23:15:33 UTC 2013

commit 0c02629f5dc39f1d948b3c8a7c5537048116e4d1
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Jun 11 18:15:04 2013 -0500

    update to 1.5.2

 .gitignore                                         |    1 +
 ...-origin-broker-1.5.2-gemfile-dependancies.patch |   20 ++++----
 openshift-origin-broker.spec                       |   55 ++++++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 63 insertions(+), 15 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 777cc8c..cef65fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /openshift-origin-broker-1.1.2.tar.gz
 /openshift-origin-broker-1.4.1.tar.gz
 /openshift-origin-broker-1.5.1.tar.gz
+/openshift-origin-broker-1.5.2.tar.gz
diff --git a/openshift-origin-broker-1.5.1-gemfile-dependancies.patch b/openshift-origin-broker-1.5.2-gemfile-dependancies.patch
similarity index 56%
rename from openshift-origin-broker-1.5.1-gemfile-dependancies.patch
rename to openshift-origin-broker-1.5.2-gemfile-dependancies.patch
index bac15be..a93e539 100644
--- a/openshift-origin-broker-1.5.1-gemfile-dependancies.patch
+++ b/openshift-origin-broker-1.5.2-gemfile-dependancies.patch
@@ -1,15 +1,15 @@
-diff -ur openshift-origin-broker-1.5.1.orig/Gemfile openshift-origin-broker-1.5.1/Gemfile
---- openshift-origin-broker-1.5.1.orig/Gemfile	2013-02-28 21:30:38.000000000 -0600
-+++ openshift-origin-broker-1.5.1/Gemfile	2013-05-16 17:45:07.586000000 -0500
-@@ -1,18 +1,19 @@
+diff -urp openshift-origin-broker-1.5.2.orig/Gemfile openshift-origin-broker-1.5.2/Gemfile
+--- openshift-origin-broker-1.5.2.orig/Gemfile	2013-04-09 21:30:44.000000000 -0500
++++ openshift-origin-broker-1.5.2/Gemfile	2013-06-11 18:11:06.501000000 -0500
+@@ -1,6 +1,6 @@
  source 'http://rubygems.org'
  
 -gem 'rails', '~> 3.2.8'
 +gem 'rails'
  gem 'json'
--gem 'parseconfig', '0.5.2'
-+gem 'parseconfig'
- gem 'xml-simple'
+ gem 'json_pure'
+ gem 'parseconfig'
+@@ -8,12 +8,13 @@ gem 'xml-simple'
  gem 'rack'
  gem 'regin'
  gem 'open4'
@@ -24,13 +24,13 @@ diff -ur openshift-origin-broker-1.5.1.orig/Gemfile openshift-origin-broker-1.5.
  
  if ENV['SOURCE']
    gem 'openshift-origin-common', :path => '../common'
-@@ -49,9 +50,9 @@
+@@ -50,9 +51,9 @@ Dir["/etc/openshift/plugins.d/*.conf"].d
  # and rake tasks are available in development mode:
  group :development, :test do
    # The require part from http://tinyurl.com/3pf68ho
--  gem 'rest-client', '1.6.1', :require => 'rest-client'
+-  gem 'rest-client', '>= 1.6.1', '<= 1.6.7', :require => 'rest-client'
 -  gem 'mocha', '0.12.1', :require => nil
--  gem 'rake', '>= 0.8.7', '<= 0.9.2.2'
+-  gem 'rake', '>= 0.8.7', '<= 0.9.6'
 +  gem 'rest-client', :require => 'rest-client'
 +  gem 'mocha'
 +  gem 'rake'
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index 319c768..65ea0e8 100644
--- a/openshift-origin-broker.spec
+++ b/openshift-origin-broker.spec
@@ -9,14 +9,14 @@
 
 Summary:       OpenShift Origin broker components
 Name:          openshift-origin-broker
-Version:       1.5.1
-Release:       2%{?dist}
+Version:       1.5.2
+Release:       1%{?dist}
 License:       ASL 2.0
 URL:           http://openshift.redhat.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
-Patch1:        openshift-origin-broker-1.5.1-gemfile-dependancies.patch
+Patch1:        openshift-origin-broker-1.5.2-gemfile-dependancies.patch
 Requires:      httpd
 Requires:      bind
 Requires:      mod_ssl
@@ -31,6 +31,7 @@ Requires:      %{?scl:%scl_prefix}rubygem(dnsruby)
 Requires:      %{?scl:%scl_prefix}rubygem(json)
 Requires:      %{?scl:%scl_prefix}rubygem(minitest)
 Requires:      %{?scl:%scl_prefix}rubygem(mongo)
+Requires:      %{?scl:%scl_prefix}rubygem(mongoid)
 Requires:      %{?scl:%scl_prefix}rubygem(open4)
 Requires:      %{?scl:%scl_prefix}rubygem(parseconfig)
 Requires:      %{?scl:%scl_prefix}rubygem-passenger
@@ -173,7 +174,53 @@ done
 %endif
 
 %changelog
-* Thu May 16 2013 Troy Dawson <tdawson at redhat.com> 1.5.1-2
+* 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
+  origin. (kraman at gmail.com)
+- Gear Move changes: Keep same uid for the gear When changing the gear from one
+  district to another. (rpenta at redhat.com)
+- Card 534 (lnader at redhat.com)
+- Merge pull request #1926 from abhgupta/abhgupta-dev
+  (dmcphers+openshiftbot at redhat.com)
+- Part 2 of Card 536 (lnader at redhat.com)
+- Part 1 of Card 536 (lnader at redhat.com)
+- Ensuring district UID randmoization check does not report false negatives
+  (abhgupta at redhat.com)
+- broker does not depend on bind (markllama at gmail.com)
+- Merge pull request #1878 from kraman/bugfix
+  (dmcphers+openshiftbot at redhat.com)
+- Fixing broker functional tests:   - PHP version selection based on OS   -
+  Creating user account for functional test on Origin (kraman at gmail.com)
+- Merge pull request #1867 from abhgupta/abhgupta-dev (dmcphers at redhat.com)
+- default read should be from primary (rchopra at redhat.com)
+- Randomizing UIDs in available_uids list for district (abhgupta at redhat.com)
+- Card 515 - Improve test coverage (lnader at redhat.com)
+- Merge pull request #1789 from brenton/master (dmcphers at redhat.com)
+- updated unit test (lnader at redhat.com)
+- Read values from node.conf for origin testing. (rmillner at redhat.com)
+- Update docs generation and add node/cartridge guides [WIP]
+  https://trello.com/c/yUMBZ0P9 (kraman at gmail.com)
+- Adding SESSION_SECRET settings to the broker and console
+  (bleanhar at redhat.com)
+- Merge pull request #1702 from kraman/f18_fixes
+  (dmcphers+openshiftbot at redhat.com)
+- Updating rest-client and rake gem versions to match F18 (kraman at gmail.com)
+- US506 : Broker rails flag to enable/disable broker in maintenance mode
+  (rpenta at redhat.com)
+- Merge pull request #1633 from lnader/revert_pull_request_1486
+  (dmcphers+openshiftbot at redhat.com)
+- Changed private_certificate to private_ssl_certificate (lnader at redhat.com)
+- Add SNI upload support to API (lnader at redhat.com)
+- Support cache config (ccoleman at redhat.com)
+- Merge pull request #1637 from brenton/BZ921257 (dmcphers at redhat.com)
+- Replacing get_value() with config['param'] style calls for new version of
+  parseconfig gem. (kraman at gmail.com)
+- Removing parseconfig version (dmcphers at redhat.com)
+- Bug 921257 - Warn users to change the default AUTH_SALT (bleanhar at redhat.com)
+- remove old obsoletes (tdawson at redhat.com)
+
+* Fri Apr 12 2013 Troy Dawson <tdawson at redhat.com> 1.5.1-2
 - Put in fixed to allow it to install and run on F19+
 
 * Tue Mar 12 2013 Troy Dawson <tdawson at redhat.com> 1.5.1-1
diff --git a/sources b/sources
index f41fe34..63a3579 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0514491d56cc14bc43cf882f14aa439  openshift-origin-broker-1.5.1.tar.gz
+fcf786cb9aa88413230c8c3d8f54ee63  openshift-origin-broker-1.5.2.tar.gz
