Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2015-10-19 22:53:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk (Old)
and /work/SRC/openSUSE:Factory/.hawk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-10-08
08:26:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-10-20
00:08:57.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Oct 19 12:02:42 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.0+git.1445255377.eeccb4a:
+ + Add missing OPTIONS routes (bsc#950070)
+ + Prevent granting/revoking tickets in simulator mode (bsc#950630)
+
+-------------------------------------------------------------------
+Thu Oct 15 22:41:25 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.0+git.1444948855.83b09ca:
+ + Require fast_gettext >= 0.9.2
+ + Relax gettext_i18n_rails dependency
+
+-------------------------------------------------------------------
Old:
----
hawk-1.0.0+git.1444218188.b3b6d44.tar.bz2
New:
----
hawk-1.0.0+git.1445255377.eeccb4a.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.5wx9ts/_old 2015-10-20 00:08:58.000000000 +0200
+++ /var/tmp/diff_new_pack.5wx9ts/_new 2015-10-20 00:08:58.000000000 +0200
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0 and Apache-2.0
Group: %{pkg_group}
-Version: 1.0.0+git.1444218188.b3b6d44
+Version: 1.0.0+git.1445255377.eeccb4a
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -75,9 +75,9 @@
BuildRequires: rubygem(%{rb_default_ruby_abi}:builder) >= 3.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5
-BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext:3.1)
-BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
+BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js)
BuildRequires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2
BuildRequires: rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4
@@ -110,8 +110,8 @@
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
-Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext:0.9)
-Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1.2)
+Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
+Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
Requires: rubygem(%{rb_default_ruby_abi}:puma:2) >= 2.11
Requires: rubygem(%{rb_default_ruby_abi}:rails:4.2)
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.5wx9ts/_old 2015-10-20 00:08:58.000000000 +0200
+++ /var/tmp/diff_new_pack.5wx9ts/_new 2015-10-20 00:08:58.000000000 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param
name="changesrevision">b3b6d440e170b909f28b4e84cd6362e7e3f7eab8</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">eeccb4aa0dac18792f6d4061d077ebac7f4a112e</param></service></servicedata>
\ No newline at end of file
++++++ hawk-1.0.0+git.1444218188.b3b6d44.tar.bz2 ->
hawk-1.0.0+git.1445255377.eeccb4a.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/Gemfile
new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/Gemfile
--- old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/Gemfile 2015-10-07
13:43:52.000000000 +0200
+++ new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/Gemfile 2015-10-19
14:02:34.000000000 +0200
@@ -52,9 +52,9 @@
gem "sprockets", ">= 3.0.0"
gem "tilt", "~> 1.4.1"
-gem "fast_gettext", "~> 0.9.2"
-gem "gettext_i18n_rails_js", "~> 1.0.2"
-gem "gettext_i18n_rails", "~> 1.2.3"
+gem "fast_gettext", ">= 0.9.2"
+gem "gettext_i18n_rails_js", "~> 1.0"
+gem "gettext_i18n_rails", "~> 1.2"
group :development do
gem "web-console", "~> 2.1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/controllers/main_controller.rb
new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/app/controllers/main_controller.rb
---
old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/app/controllers/main_controller.rb
2015-10-07 13:43:52.000000000 +0200
+++
new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/app/controllers/main_controller.rb
2015-10-19 14:02:34.000000000 +0200
@@ -163,7 +163,11 @@
end
def ticket_grant
- if params[:ticket] && params[:site]
+ if ENV['CIB_shadow']
+ render :status => 400, :json => {
+ :error => _('Use the simulator controls while simulator is active')
+ }
+ elsif params[:ticket] && params[:site]
invoke "booth", "client", "grant", "-t", params[:ticket], "-s",
params[:site]
else
render :status => 400, :json => {
@@ -173,7 +177,11 @@
end
def ticket_revoke
- if params[:ticket]
+ if ENV['CIB_shadow']
+ render :status => 400, :json => {
+ :error => _('Use the simulator controls while simulator is active')
+ }
+ elsif params[:ticket]
invoke "booth", "client", "revoke", "-t", params[:ticket]
else
render :status => 400, :json => {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/config/routes.rb
new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/config/routes.rb
--- old/hawk-1.0.0+git.1444218188.b3b6d44/hawk/config/routes.rb 2015-10-07
13:43:52.000000000 +0200
+++ new/hawk-1.0.0+git.1445255377.eeccb4a/hawk/config/routes.rb 2015-10-19
14:02:34.000000000 +0200
@@ -32,8 +32,13 @@
Rails.application.routes.draw do
root :to => 'main#index'
- resource :session
+ resource :session, via: [:post, :options]
resources :cib do
+ member do
+ get action: "show"
+ match action: "show", via: [:post, :options]
+ end
+
resources :crm_config
resources :resources
resources :primitives
@@ -83,8 +88,8 @@
match 'main/graph_gen' => 'main#graph_gen', as: :graph_gen, via: [:get,
:post]
match 'main/graph_get' => 'main#graph_get', as: :graph_get, via: [:get,
:post]
match '/' => 'main#index', via: [:get, :post]
- match '/login' => 'sessions#new', as: :login, via: [:get, :post]
+ match '/login' => 'sessions#new', as: :login, via: [:get, :post, :options]
match '/logout' => 'sessions#destroy', as: :logout, via: [:get, :post]
match 'dashboard' => 'dashboard#index', as: :dashboard, via: [:get, :post]
- get 'monitor' => 'monitor#monitor', :as => :monitor
+ get 'monitor' => 'monitor#monitor', :as => :monitor, via: [:get, :options]
end
