[perl-Directory-Queue/el6/master: 7/7] Merge branch 'master' into el6
by stevetraylen
commit ec675605f066eb24c8d9e34942214dbde6f3abe1
Merge: 7e1c4f3 887ac45
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Tue Aug 31 12:09:26 2010 +0200
Merge branch 'master' into el6
Conflicts:
.gitignore
perl-Directory-Queue.spec
sources
.gitignore | 2 +-
perl-Directory-Queue.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 598cf28,fa03236..de58323
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Directory-Queue-0.5.tar.gz
+ /Directory-Queue-1.0.tar.gz
13 years, 8 months
[perl-Directory-Queue/el6/master] (7 commits) ...Merge branch 'master' into el6
by stevetraylen
Summary of changes:
a3253e0... Import #607355 (*)
2955acc... Populate branches: #607355 (*)
5eabdf1... Bump release due to my mitake. (*)
53632de... dist-git conversion (*)
261e22f... Upstream to 1.0. (*)
887ac45... actually change release. (*)
ec67560... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
13 years, 8 months
[perl-Directory-Queue/f13/master: 7/7] Merge branch 'master' into f13
by stevetraylen
commit 203c5e1b00757f5c108411dc4f6cabba082a3e90
Merge: 4bb420f 887ac45
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Tue Aug 31 12:04:27 2010 +0200
Merge branch 'master' into f13
Conflicts:
.gitignore
perl-Directory-Queue.spec
sources
.gitignore | 2 +-
perl-Directory-Queue.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 598cf28,fa03236..85a14ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Directory-Queue-0.5.tar.gz
-/Directory-Queue-1.0.tar.gz
++Directory-Queue-1.0.tar.gz
13 years, 8 months
[perl-Directory-Queue/f13/master] (7 commits) ...Merge branch 'master' into f13
by stevetraylen
Summary of changes:
a3253e0... Import #607355 (*)
2955acc... Populate branches: #607355 (*)
5eabdf1... Bump release due to my mitake. (*)
53632de... dist-git conversion (*)
261e22f... Upstream to 1.0. (*)
887ac45... actually change release. (*)
203c5e1... Merge branch 'master' into f13
(*) This commit already existed in another branch; no separate mail sent
13 years, 8 months
[perl-Directory-Queue/f14/master: 3/3] Correct ignored file.
by stevetraylen
commit 7b3f3ad9374f7751b85aa1265a3f30a815080123
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Tue Aug 31 11:59:12 2010 +0200
Correct ignored file.
.gitignore | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa03236..85a14ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Directory-Queue-0.5.tar.gz
-/Directory-Queue-1.0.tar.gz
+Directory-Queue-1.0.tar.gz
13 years, 8 months
[perl-Directory-Queue] actually change release.
by stevetraylen
commit 887ac459e9155ba18c005ca3bb4a3854e163bd1a
Author: Steve Traylen <steve.traylen(a)cern.ch>
Date: Tue Aug 31 11:07:52 2010 +0200
actually change release.
perl-Directory-Queue.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/perl-Directory-Queue.spec b/perl-Directory-Queue.spec
index 985f39c..96a2904 100644
--- a/perl-Directory-Queue.spec
+++ b/perl-Directory-Queue.spec
@@ -1,6 +1,6 @@
Name: perl-Directory-Queue
Version: 1.0
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Object oriented interface to a directory based queue
License: GPL+ or Artistic
Group: Development/Libraries
13 years, 8 months
