Merge 41a5169 into 0b1ea37

SUSE · Jul 20, 2018 · 0366917 · 0366917
2 parents 0b1ea37 + 41a5169
commit 0366917
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -58,5 +58,6 @@ dist: clean man
 	sed -i '/source .*rubygems\.org/d' $(NAME)-$(VERSION)/Gemfile
 	sed -i '/remote: .*rubygems\.org/d' $(NAME)-$(VERSION)/Gemfile.lock
 
+	find $(NAME)-$(VERSION) -name \*~ -exec rm {} \;
 	tar cfvj package/$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)/
 	rm -rf $(NAME)-$(VERSION)/
diff --git a/app/serializers/v3/system_serializer.rb b/app/serializers/v3/system_serializer.rb
@@ -1,5 +1,5 @@
 class V3::SystemSerializer < ApplicationSerializer
 
-  attributes :id, :login, :password
+  attributes :id, :login, :password, :last_seen_at
 
 end
diff --git a/lib/rmt.rb b/lib/rmt.rb
@@ -1,5 +1,5 @@
 module RMT
-  VERSION ||= '1.0.4'.freeze
+  VERSION ||= '1.0.5'.freeze
 
   DEFAULT_USER = '_rmt'.freeze
   DEFAULT_GROUP = 'nginx'.freeze

diff --git a/package/rmt-server.changes b/package/rmt-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 19 12:27:23 UTC 2018 - wstephenson@suse.com
+
+- Version 1.0.5
+- Include 'last_seen_at' field in API systems output, for 
+  consistency with SCC
+
 -------------------------------------------------------------------
 Wed Jul  4 15:32:13 UTC 2018 - fschueller@suse.com
 

diff --git a/package/rmt-server.spec b/package/rmt-server.spec
@@ -25,7 +25,7 @@
 %define is_sle_12_family 1
 %endif
 Name:           rmt-server
-Version:        1.0.4
+Version:        1.0.5
 Release:        0
 Summary:        Repository mirroring tool and registration proxy for SCC
 License:        GPL-2.0-or-later