Index: branches/2018Q2/sysutils/logstash6/files/patch-Gemfile
===================================================================
--- branches/2018Q2/sysutils/logstash6/files/patch-Gemfile	(revision 470222)
+++ branches/2018Q2/sysutils/logstash6/files/patch-Gemfile	(nonexistent)
@@ -1,10 +0,0 @@
---- Gemfile.orig	2018-03-14 22:38:33 UTC
-+++ Gemfile
-@@ -4,6 +4,7 @@
- source "https://rubygems.org"
- gem "logstash-core", :path => "./logstash-core"
- gem "logstash-core-plugin-api", :path => "./logstash-core-plugin-api"
-+gem "atomic", "<= 1.1.99"
- gem "paquet", "~> 0.2.0"
- gem "ruby-progressbar", "~> 1.8.1"
- gem "builder", "~> 3.2.2"

Property changes on: branches/2018Q2/sysutils/logstash6/files/patch-Gemfile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock
===================================================================
--- branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock	(revision 470222)
+++ branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock	(nonexistent)
@@ -1,10 +0,0 @@
---- Gemfile.lock.orig	2018-03-14 22:30:17 UTC
-+++ Gemfile.lock
-@@ -604,6 +604,7 @@ PLATFORMS
-   java
- 
- DEPENDENCIES
-+  atomic (<= 1.1.99)
-   benchmark-ips
-   builder (~> 3.2.2)
-   ci_reporter_rspec (= 1.0.0)

Property changes on: branches/2018Q2/sysutils/logstash6/files/patch-Gemfile.lock
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 470222)
+++ branches/2018Q2	(revision 470223)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r467323