[openshift-origin-util] updating to 1.0.4

[tdawson]

commit 852abdba2dec507f6f63997784b699b96c20f2b5
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 12:07:54 2013 -0600

    updating to 1.0.4

 .gitignore                 |    1 +
 openshift-origin-util.spec |   44 ++++++++++++++++++++++++++++++--------------
 sources                    |    3 +--
 3 files changed, 32 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df979b3..c4dca62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openshift-origin-util-1.0.3.tar.gz
 /openshift-origin-util-files-1.0.3.tar.gz
+/openshift-origin-util-1.0.4.tar.gz
diff --git a/openshift-origin-util.spec b/openshift-origin-util.spec
index 93c2320..4893610 100644
--- a/openshift-origin-util.spec
+++ b/openshift-origin-util.spec
@@ -1,23 +1,21 @@
 Summary:        Utility scripts for the OpenShift Origin broker and node
 Name:           openshift-origin-util
-Version:        1.0.3
-Release:        3%{?dist}
+Version:        1.0.4
+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
-Source1:        openshift-origin-util-files-1.0.3.tar.gz
 Requires:       bind-utils
 Requires:       ruby
 Requires:       rubygems
 BuildArch:      noarch
 
 %description
-This package contains a set of utility scripts for 
-the OpenShift broker and node. 
+This package contains a set of utility scripts for the
+OpenShift broker and node. 
 
 %prep
 %setup -q
-tar xvfz %{SOURCE1}
 
 %build
 
@@ -33,14 +31,32 @@ chmod 0755 %{buildroot}%{_bindir}/*
 
 
 %changelog
-* Wed Jan 09 2013 Troy Dawson <tdawson at redhat.com> 1.0.3-3
-- oo-diagnostics uses ruby's tempfile
-- oo-exec-ruby has comments to say what it is for
-- Added Requires: rubygems and bind-utils
-
-* Thu Jan 03 2013 Troy Dawson <tdawson at redhat.com> 1.0.3-2
-- Added Source1, files that didn't make the upstream tarball
-- Added Requires: ruby
+* Mon Jan 28 2013 Krishna Raman <kraman at gmail.com> 1.0.4-1
+- Merge pull request #1132 from tdawson/tdawson/fed-update/util-1.0.3
+  (dmcphers+openshiftbot at redhat.com)
+- Merge pull request #1153 from pmorie/bugs/875910
+  (dmcphers+openshiftbot at redhat.com)
+- fix the dns prereq test; no more false positives (lmeyer at redhat.com)
+- Fix BZ875910: make oo-accept-node extensible (pmorie at gmail.com)
+- spec file cleanup (tdawson at redhat.com)
+- Testing for altered packaged-owned configs (calfonso at redhat.com)
+- add oo-diag tests for: chkconfig services missing, quota bug, rogue vhost.
+  also abortok flag. (lmeyer at redhat.com)
+- Updates to oo-diagnostics. Mainly, added tests for 3-way consistency between
+  conf, node hosts, and districts. Added a pass for some enterprise RPMs that
+  didn't get the right dist. Amended top instructions to describe output
+  levels. Place DNS test first to enable bailing out early. Run oo-accept-
+  systems if present. (lmeyer at redhat.com)
+- re-enabed ews2 (bdecoste at gmail.com)
+- Adding tests for broken nameserver, stale cartridge cache, broken PAM setup.
+  Also some better error recovery if broker app env doesn't load.
+  (lmeyer at redhat.com)
+- use env ruby; add mco TTL check (lmeyer at redhat.com)
+- adding oo-diagnostics script (lmeyer at redhat.com)
+- use /bin/env for cron (dmcphers at redhat.com)
+- Working around scl enable limitations with parameter passing
+  (dmcphers at redhat.com)
+- add oo-ruby (dmcphers at redhat.com)
 
 * Wed Nov 21 2012 Dan McPherson <dmcphers at redhat.com> 1.0.3-1
 - Bumped to new version
diff --git a/sources b/sources
index 919ce32..d1349ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-41375d45314f78ee10701a75c024f152  openshift-origin-util-1.0.3.tar.gz
-665dc1c489470ea63d10ef3bab4c74b6  openshift-origin-util-files-1.0.3.tar.gz
+6c012757883e97da0c298181ee078240  openshift-origin-util-1.0.4.tar.gz