[rubygem-openshift-origin-node] update to version 1.2.6

[tdawson]

commit ec2f51510916febd0ce07d48d5d4562809952eb4
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Dec 19 15:31:43 2012 -0600

    update to version 1.2.6

 .gitignore                         |    1 +
 rubygem-openshift-origin-node.spec |   46 +++++++++++++++++++++++++++++++++--
 sources                            |    2 +-
 3 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55437f7..fed5b2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /openshift-origin-node-0.14.6.gem
 /openshift-origin-node-1.1.7.gem
+/openshift-origin-node-1.2.6.gem
diff --git a/rubygem-openshift-origin-node.spec b/rubygem-openshift-origin-node.spec
index 556da6b..81aa928 100644
--- a/rubygem-openshift-origin-node.spec
+++ b/rubygem-openshift-origin-node.spec
@@ -12,8 +12,8 @@
 
 Summary:        Cloud Development Node
 Name:           rubygem-%{gem_name}
-Version:        1.1.7
-Release:        2%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://openshift.redhat.com
@@ -171,7 +171,47 @@ if ! [ -f /etc/openshift/resource_limits.conf ]; then
 fi
 
 %changelog
-* Tue Dec 04 2012 Troy Dawson <tdawson at redhat.com> 1.1.7-2
+* Mon Dec 10 2012 Adam Miller <admiller at redhat.com> 1.2.6-1
+- Merge pull request #1007 from sosiouxme/US3036-origin
+  (openshift+bot at redhat.com)
+- Adding oo-accept-systems script for verifying all node hosts from the broker.
+  - also verifies cartridge consistency and checks for stale cartridge cache.
+  oo-accept-node sanity checks public_ip and public_hostname. Minor edits to
+  make node.conf easier to understand. (lmeyer at redhat.com)
+- Fix tests.  The file mock was not working. (rmillner at redhat.com)
+- Post rebase code cleanup. (rmillner at redhat.com)
+- Proper host name validation. (rmillner at redhat.com)
+
+* Thu Dec 06 2012 Adam Miller <admiller at redhat.com> 1.2.5-1
+- bug 884409 (dmcphers at redhat.com)
+- Merge pull request #1023 from ramr/dev/websockets (openshift+bot at redhat.com)
+- Fix frontend httpd tests. (ramr at redhat.com)
+- Node web sockets and http(s) proxy support with spec file and package.
+  (ramr at redhat.com)
+
+* Wed Dec 05 2012 Adam Miller <admiller at redhat.com> 1.2.4-1
+- Fix for Bug 883605 (jhonce at redhat.com)
+- updated gemspecs so they work with scl rpm spec files. (tdawson at redhat.com)
+
+* Tue Dec 04 2012 Adam Miller <admiller at redhat.com> 1.2.3-1
+- Merge pull request #1005 from ironcladlou/US2770 (openshift+bot at redhat.com)
+- Refactor tidy into the node library (ironcladlou at gmail.com)
+- Bug Fixes. (rmillner at redhat.com)
+- Move add/remove alias to the node API. (rmillner at redhat.com)
+
+* Thu Nov 29 2012 Adam Miller <admiller at redhat.com> 1.2.2-1
+- Move force-stop into the the node library (ironcladlou at gmail.com)
+- exit code and usage cleanup (dmcphers at redhat.com)
+- Merge pull request #962 from danmcp/master (openshift+bot at redhat.com)
+- Merge pull request #905 from kraman/ruby19 (openshift+bot at redhat.com)
+- add oo-ruby (dmcphers at redhat.com)
+- F18 compatibility fixes   - apache 2.4   - mongo journaling   - JDK 7   -
+  parseconfig gem update Bugfix for Bind DNS plugin (kraman at gmail.com)
+
+* Sat Nov 17 2012 Adam Miller <admiller at redhat.com> 1.2.1-1
+- bump_minor_versions for sprint 21 (admiller at redhat.com)
+
+* Thu Nov 15 2012 Troy Dawson <tdawson at redhat.com> 1.1.7-2
 - Fixed source, change from tar to gem
 - added source1, not in the gem.
 - Fix http conf file to work with httpd 2.4.2+
diff --git a/sources b/sources
index 27650b7..b5195d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e90ac83320e45c3b5ff6ef87101539f1  openshift-origin-node-1.1.7.gem
+820c27d7c3f12c7afa571048044dd26a  openshift-origin-node-1.2.6.gem