[openshift-origin-broker] update to version 1.1.2

Wed Jan 30 20:54:05 UTC 2013

commit 49e96126f1544c24721dd2b629b0f4e87d65422f
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 14:53:48 2013 -0600

    update to version 1.1.2

 .gitignore                                         |    1 +
 ...-origin-broker-1.1.2-gemfile-dependancies.patch |   10 ++--
 openshift-origin-broker.spec                       |   72 +++++++++++++++++++-
 sources                                            |    2 +-
 4 files changed, 76 insertions(+), 9 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 152b67b..5ed186c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /openshift-origin-broker-0.6.7.tar.gz
 /openshift-origin-broker-0.6.17.tar.gz
 /openshift-origin-broker-1.1.1.tar.gz
+/openshift-origin-broker-1.1.2.tar.gz
diff --git a/openshift-origin-broker-1.1.1-gemfile-dependancies.patch b/openshift-origin-broker-1.1.2-gemfile-dependancies.patch
similarity index 61%
rename from openshift-origin-broker-1.1.1-gemfile-dependancies.patch
rename to openshift-origin-broker-1.1.2-gemfile-dependancies.patch
index b361cd8..ed419c6 100644
--- a/openshift-origin-broker-1.1.1-gemfile-dependancies.patch
+++ b/openshift-origin-broker-1.1.2-gemfile-dependancies.patch
@@ -1,6 +1,6 @@
-diff -ur openshift-origin-broker-1.1.1.orig/Gemfile openshift-origin-broker-1.1.1/Gemfile
---- openshift-origin-broker-1.1.1.orig/Gemfile	2012-12-20 11:54:12.000000000 -0600
-+++ openshift-origin-broker-1.1.1/Gemfile	2013-01-15 11:09:46.616000000 -0600
+diff -ur openshift-origin-broker-1.1.2.orig/Gemfile openshift-origin-broker-1.1.2/Gemfile
+--- openshift-origin-broker-1.1.2.orig/Gemfile	2013-01-26 09:30:03.000000000 -0600
++++ openshift-origin-broker-1.1.2/Gemfile	2013-01-30 14:49:42.148000000 -0600
 @@ -1,8 +1,8 @@
  source 'http://rubygems.org'
  
@@ -9,10 +9,10 @@ diff -ur openshift-origin-broker-1.1.1.orig/Gemfile openshift-origin-broker-1.1.
  gem 'json'
 -gem 'parseconfig', '0.5.2'
 +gem 'parseconfig'
- gem 'mongo'
  gem 'xml-simple'
  gem 'rack'
-@@ -41,7 +41,7 @@
+ gem 'regin'
+@@ -42,7 +42,7 @@
  # and rake tasks are available in development mode:
  group :development, :test do
    # The require part from http://tinyurl.com/3pf68ho
diff --git a/openshift-origin-broker.spec b/openshift-origin-broker.spec
index 300721d..78704ee 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.1.1
-Release:   2%{?dist}
+Version:   1.1.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.1.1-gemfile-dependancies.patch
+Patch1:    openshift-origin-broker-1.1.2-gemfile-dependancies.patch
 Requires:  httpd
 Requires:  bind
 Requires:  mod_ssl
@@ -147,6 +147,8 @@ done
 %attr(0644,-,-) %ghost %{_localstatedir}/log/openshift/user_action.log
 %{brokerdir}
 %{htmldir}/broker
+%config %{brokerdir}/config/environments/production.rb
+%config %{brokerdir}/config/environments/development.rb
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_proxy.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/000000_openshift_origin_broker_servername.conf
 %config(noreplace) %{_sysconfdir}/openshift/broker.conf
@@ -161,6 +163,70 @@ done
 %endif
 
 %changelog
+* Mon Jan 28 2013 Krishna Raman <kraman at gmail.com> 1.1.2-1
+- Merge pull request #1212 from brenton/misc5
+  (dmcphers+openshiftbot at redhat.com)
+- Bug 873180 (dmcphers at redhat.com)
+- Disable test that doesnt work with concurrency (dmcphers at redhat.com)
+- BZ888056 - production.rb should not be marked as a conf file
+  (bleanhar at redhat.com)
+- fixing rebase/merge issue that caused missing comma in test rails env
+  configuration (abhgupta at redhat.com)
+- using openshift_broker_test db in test rails env for origin broker
+  (abhgupta at redhat.com)
+- Fix SSL option in mongoid.yml (rpenta at redhat.com)
+- bumping rest api version to handle change in rest user model
+  (abhgupta at redhat.com)
+- Fix usage model unit test (rpenta at redhat.com)
+- Fix Usage: Through an error instead of bailing out when gear was created with
+  usage-tracking disabled and later on gear was destroyed with usage-tracking
+  enabled (rpenta at redhat.com)
+- District unit test: clear all districts that were created during teardown
+  phase (rpenta at redhat.com)
+- Remove old mongo datastore test (rpenta at redhat.com)
+- Added system, subuser, usage tests from li repo (rpenta at redhat.com)
+- Fix district model and district unit tests rework (rpenta at redhat.com)
+- fixing broker integration tests (abhgupta at redhat.com)
+- minor cleanup (rpenta at redhat.com)
+- Populate mongoid.yml config from Rails datastore configuration.
+  (rpenta at redhat.com)
+- uncommenting app_cart_delete_v1 rest unit test (abhgupta at redhat.com)
+- uncommenting scale down unit test (abhgupta at redhat.com)
+- uncommenting app scale down unit tests (abhgupta at redhat.com)
+- fixing integration test (abhgupta at redhat.com)
+- Bug 889947 (lnader at redhat.com)
+- Fix for bug 889978 (abhgupta at redhat.com)
+- commenting out broken tests for now - were always broke but error was hidden
+  before (dmcphers at redhat.com)
+- fixing broker tests again after rebase (abhgupta at redhat.com)
+- fixing mongoid.yml for broker tests (abhgupta at redhat.com)
+- fix mongoid.yml username (dmcphers at redhat.com)
+- add dynect migration (dmcphers at redhat.com)
+- removed debug statements (lnader at redhat.com)
+- add random number to app alias (lnader at redhat.com)
+- removing app templates and other changes (dmcphers at redhat.com)
+- fixing rest_api_test and fixing backward compatibility bugs
+  (lnader at redhat.com)
+- fix broker integration tests (dmcphers at redhat.com)
+- fix create domain breakage (dmcphers at redhat.com)
+- fix broker functional tests (dmcphers at redhat.com)
+- fix functional tests (dmcphers at redhat.com)
+- fixing cloud user test cases (dmcphers at redhat.com)
+- test case fixes + typo fixes (dmcphers at redhat.com)
+- fixup cloud user usages (dmcphers at redhat.com)
+- fix db for test (dmcphers at redhat.com)
+- add bson_ext (dmcphers at redhat.com)
+- Added support for thread dump. Fixed default username in mongoid.yml file
+  (kraman at gmail.com)
+- Moving model refactor work - Updated cartridge manifest files - Simplified
+  descriptor - Switched from mongo gem to use mongoid (kraman at gmail.com)
+- Ensure write to at least 2 mongo instances (dmcphers at redhat.com)
+- Merge pull request #1192 from Miciah/bz-902630-failed-to-reload-openshift-
+  broker-service (dmcphers at redhat.com)
+- Bug 902630: fix `service openshift-broker reload` (miciah.masters at gmail.com)
+- Adding support for broker to mongodb connections over SSL
+  (calfonso at redhat.com)
+
 * Fri Jan 11 2013 Troy Dawson <tdawson at redhat.com> 1.1.1-2
 - Updated spec file to match the version in Fedora
 
diff --git a/sources b/sources
index bd24d51..104a36c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd4bcf390ede49530b1baaa21e586af3  openshift-origin-broker-1.1.1.tar.gz
+dd45f2bdfd52505b44c300f5404f3def  openshift-origin-broker-1.1.2.tar.gz
